Switch infra to new puppet apply job

The new job is an integration test between config and puppet
modules.  Start using it.

Add it to puppet-storyboard.  Also, correct the names of the
puppet lint/syntax jobs that were inexplicably set to 'config'.

Change-Id: I48c0681a30d507bd7627d6b73c529e2074993d9a
This commit is contained in:
James E. Blair 2014-09-15 14:28:27 -07:00
parent 542e170b81
commit fd80460a35
5 changed files with 20 additions and 48 deletions

View File

@ -114,10 +114,6 @@
publishers:
- console-log
- builder:
name: infra-puppet-apply
builders:
- job-template:
name: 'gate-infra-puppet-apply-{ostype}'
node: 'bare-{ostype}'

View File

@ -118,11 +118,6 @@
erb -x -T '-' $f | ruby -c
done
- builder:
name: puppet-apply
builders:
- shell: "./test.sh"
- builder:
name: ruby-191-prep
builders:

View File

@ -274,7 +274,6 @@
jobs:
- puppet-check-jobs
- gate-{name}-puppet-apply
- gate-{name}-pep8
- gate-{name}-bashate
- experimental-swift-logs-{name}-pep8
@ -1548,6 +1547,14 @@
- '{name}-js-release-{branch-designator}':
branch-designator: 'branch'
- project:
name: puppet-storyboard
node: 'bare-precise || bare-trusty'
tarball-site: tarballs.openstack.org
jobs:
- puppet-check-jobs
- project:
name: vinz
node: 'bare-precise || bare-trusty'

View File

@ -46,34 +46,6 @@
- 'gate-{name}-puppet-lint'
- 'gate-{name}-puppet-syntax'
- job-template:
name: 'gate-{name}-puppet-apply-precise'
node: 'bare-precise || bare-trusty'
builders:
- gerrit-git-prep
- puppet-apply
publishers:
- console-log
- job-template:
name: 'gate-{name}-puppet-apply-centos6'
node: bare-centos6
builders:
- gerrit-git-prep
- puppet-apply
publishers:
- console-log
- job-group:
name: 'gate-{name}-puppet-apply'
jobs:
- 'gate-{name}-puppet-apply-centos6'
- 'gate-{name}-puppet-apply-precise'
- job-group:
name: 'puppet-module-unit'
puppet_version:

View File

@ -2936,26 +2936,24 @@ projects:
- gate-config-pep8
- gate-config-bashate
- gate-config-puppet-syntax
- gate-config-puppet-apply-precise
- gate-config-puppet-apply-centos6
- gate-config-irc-access
- gate-config-projects-yaml
- gate-ci-docs
- gate-infra-puppet-apply-precise
- gate-infra-puppet-apply-centos6
gate:
- gate-config-layout
- gate-config-pep8
- gate-config-puppet-syntax
- gate-config-puppet-apply-precise
- gate-config-puppet-apply-centos6
- gate-config-irc-access
- gate-config-projects-yaml
- gate-ci-docs
- gate-infra-puppet-apply-precise
- gate-infra-puppet-apply-centos6
post:
- ci-docs
experimental:
- experimental-swift-logs-config-pep8
- gate-infra-puppet-apply-precise
- gate-infra-puppet-apply-centos6
- name: openstack-infra/devstack-gate
template:
@ -3235,11 +3233,15 @@ projects:
template:
- name: merge-check
check:
- gate-config-puppet-lint
- gate-config-puppet-syntax
- gate-puppet-storyboard-puppet-lint
- gate-puppet-storyboard-puppet-syntax
- gate-infra-puppet-apply-precise
- gate-infra-puppet-apply-centos6
gate:
- gate-config-puppet-lint
- gate-config-puppet-syntax
- gate-puppet-storyboard-puppet-lint
- gate-puppet-storyboard-puppet-syntax
- gate-infra-puppet-apply-precise
- gate-infra-puppet-apply-centos6
- name: openstack-infra/puppet-vinz
template: