openstack/project-config
Code Issues Proposed changes

Move puppet-unit gate to devstack-centos7

Browse Source 
The main reason is to move away from the bare nodes, since -infra will
be retiring in the future.  Additionally, we move into centos7 to
avoid the hurt of other projects using devstack-trusty.

Since we are installing puppet from gems, we don't need to rely on the
OS as much. However, if we want to add a devstack-trusty node in the
future, we now can easily.

Change-Id: I79d216c4c84ebc954caef627ce64d7e72fdad8ff
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-07-31 19:19:00 -04:00
parent e723f89c18
commit bc2f6197bd
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jenkins/jobs/puppet-module-jobs.yaml
View File

@ -1,11 +1,13 @@
- job-template: - job-template:
name: 'gate-{name}-puppet-unit-{puppet_version}' name: 'gate-{name}-puppet-unit-{puppet_version}-dsvm-{ostype}'
node: '{node}' node: 'devstack-{ostype}'
builders: builders:
- puppet-prepare-node - puppet-prepare-node
- revoke-sudo
- gerrit-git-prep - gerrit-git-prep
- shell: |
sudo gem install bundler --no-rdoc --no-ri --verbose
- revoke-sudo
- shell: | - shell: |
if [ "{puppet_version}" != "latest" ]; then if [ "{puppet_version}" != "latest" ]; then
export PUPPET_GEM_VERSION='~> {puppet_version}.0' export PUPPET_GEM_VERSION='~> {puppet_version}.0'
@ -230,8 +232,10 @@
- 3.8 - 3.8
- 4.0 - 4.0
- 'latest' - 'latest'
ostype:
- centos7
jobs: jobs:
- 'gate-{name}-puppet-unit-{puppet_version}' - 'gate-{name}-puppet-unit-{puppet_version}-dsvm-{ostype}'
- job-group: - job-group:
name: 'puppet-beaker-jobs' name: 'puppet-beaker-jobs'

26
zuul/layout.yaml
View File

@ -509,22 +509,22 @@ project-templates:
- name: puppet-module-unit-jobs - name: puppet-module-unit-jobs
check: check:
- gate-{name}-puppet-unit-3.3 - gate-{name}-puppet-unit-3.3-dsvm-centos7
- gate-{name}-puppet-unit-3.4 - gate-{name}-puppet-unit-3.4-dsvm-centos7
# 3.5 was swiftly replaced with 3.6 # 3.5 was swiftly replaced with 3.6
- gate-{name}-puppet-unit-3.6 - gate-{name}-puppet-unit-3.6-dsvm-centos7
- gate-{name}-puppet-unit-3.7 - gate-{name}-puppet-unit-3.7-dsvm-centos7
- gate-{name}-puppet-unit-3.8 - gate-{name}-puppet-unit-3.8-dsvm-centos7
- gate-{name}-puppet-unit-4.0 - gate-{name}-puppet-unit-4.0-dsvm-centos7
- gate-{name}-puppet-unit-latest - gate-{name}-puppet-unit-latest-dsvm-centos7
gate: gate:
- gate-{name}-puppet-unit-3.3 - gate-{name}-puppet-unit-3.3-dsvm-centos7
- gate-{name}-puppet-unit-3.4 - gate-{name}-puppet-unit-3.4-dsvm-centos7
# 3.5 was swiftly replaced with 3.6 # 3.5 was swiftly replaced with 3.6
- gate-{name}-puppet-unit-3.6 - gate-{name}-puppet-unit-3.6-dsvm-centos7
- gate-{name}-puppet-unit-3.7 - gate-{name}-puppet-unit-3.7-dsvm-centos7
- gate-{name}-puppet-unit-3.8 - gate-{name}-puppet-unit-3.8-dsvm-centos7
- gate-{name}-puppet-unit-4.0 - gate-{name}-puppet-unit-4.0-dsvm-centos7
- name: infra-puppet-apply-jobs - name: infra-puppet-apply-jobs
check: check: