opendev/system-config
Code Issues Proposed changes

Merge "Switch infra to new puppet apply job"

Browse Source
This commit is contained in:
Jenkins 2014-09-16 00:12:14 +00:00 committed by Gerrit Code Review
commit 8ca0d05aea
5 changed files with 20 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/files/jenkins_job_builder/config/infra.yaml
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}'

5
modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
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:

9
modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
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'

28
modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
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:

22
modules/openstack_project/files/zuul/layout.yaml
View File

@ -2960,26 +2960,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:
@ -3259,11 +3257,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: