puppet/tripleo: stop testing Puppet 3 in Pike and beyond

Puppet 3 is not supported by Puppet OpenStack community starting from
Pike cycle. So we don't want to run the CI jobs anymore.

Because infra is still running syntax-3 jobs, we create a -legacy job
only used by Puppet OpenStack, and run it only on the branches that we
want.

Change-Id: Ifc742361efce1b7f56a3b23046d72642ba697434
This commit is contained in:
Emilien Macchi 2017-03-21 17:07:38 -04:00
parent f0e234d309
commit 7746dbbc12
2 changed files with 33 additions and 20 deletions

View File

@ -28,7 +28,7 @@
git://git.openstack.org openstack/puppet-openstack-integration
- job-template:
name: 'gate-{name}-puppet-unit-{puppet_version}-{node}'
name: 'gate-{name}-puppet-unit-{puppet_version}-{legacy}{node}'
node: '{node}'
builders:
@ -153,7 +153,7 @@
- console-log
- job-template:
name: 'gate-{name}-puppet-syntax-{puppet_version}-{node}'
name: 'gate-{name}-puppet-syntax-{puppet_version}-{legacy}{node}'
node: '{node}'
builders:
@ -238,7 +238,7 @@
- console-log
- job-template:
name: 'gate-puppet-openstack-libraries-puppet-syntax-{puppet_version}-{node}'
name: 'gate-puppet-openstack-libraries-puppet-syntax-{puppet_version}-{legacy}{node}'
node: '{node}'
builders:
@ -366,11 +366,14 @@
- 3
- 4
node: centos-7
legacy:
- ''
- 'legacy-'
jobs:
- 'gate-{name}-puppet-lint'
- 'gate-{name}-puppet-syntax'
- 'gate-{name}-puppet-module-build'
- 'gate-{name}-puppet-syntax-{puppet_version}-{node}'
- 'gate-{name}-puppet-syntax-{puppet_version}-{legacy}{node}'
- job-group:
name: 'puppet-module-unit'
@ -385,8 +388,11 @@
- 'latest'
puppet_unit_version: '3.3 3.4 3.6 3.7 3.8 4.0 4.5 latest'
node: centos-7
legacy:
- ''
- 'legacy-'
jobs:
- 'gate-{name}-puppet-unit-{puppet_version}-{node}'
- 'gate-{name}-puppet-unit-{puppet_version}-{legacy}{node}'
- job-group:
name: 'puppet-beaker-jobs-trusty'
@ -432,8 +438,11 @@
puppet_version:
- 3
- 4
legacy:
- ''
- 'legacy-'
jobs:
- 'gate-puppet-openstack-libraries-puppet-lint-{node}'
- 'gate-puppet-openstack-libraries-puppet-syntax-{puppet_version}-{node}'
- 'gate-puppet-openstack-libraries-puppet-syntax-{puppet_version}-{legacy}{node}'
- 'gate-puppet-openstack-libraries-puppet-unit-{node}'
- 'gate-puppet-openstack-libraries-puppet-beaker-rspec-{node}'

View File

@ -953,13 +953,13 @@ project-templates:
- name: puppet-openstack-libraries-jobs
check:
- gate-puppet-openstack-libraries-puppet-lint-centos-7
- gate-puppet-openstack-libraries-puppet-syntax-3-centos-7
- gate-puppet-openstack-libraries-puppet-syntax-3-legacy-centos-7
- gate-puppet-openstack-libraries-puppet-syntax-4-centos-7
- gate-puppet-openstack-libraries-puppet-unit-centos-7
- gate-puppet-openstack-libraries-puppet-beaker-rspec-centos-7
gate:
- gate-puppet-openstack-libraries-puppet-lint-centos-7
- gate-puppet-openstack-libraries-puppet-syntax-3-centos-7
- gate-puppet-openstack-libraries-puppet-syntax-3-legacy-centos-7
- gate-puppet-openstack-libraries-puppet-syntax-4-centos-7
- gate-puppet-openstack-libraries-puppet-unit-centos-7
- gate-puppet-openstack-libraries-puppet-beaker-rspec-centos-7
@ -986,33 +986,33 @@ project-templates:
- name: puppet-check-jobs
check:
- gate-{name}-puppet-lint
- gate-{name}-puppet-syntax-3-centos-7
- gate-{name}-puppet-syntax-3-legacy-centos-7
- gate-{name}-puppet-syntax-4-centos-7
- gate-{name}-puppet-module-build
gate:
- gate-{name}-puppet-lint
- gate-{name}-puppet-syntax-3-centos-7
- gate-{name}-puppet-syntax-3-legacy-centos-7
- gate-{name}-puppet-syntax-4-centos-7
- gate-{name}-puppet-module-build
- name: puppet-module-unit-jobs
check:
- gate-{name}-puppet-unit-3.3-centos-7
- gate-{name}-puppet-unit-3.4-centos-7
- gate-{name}-puppet-unit-3.3-legacy-centos-7
- gate-{name}-puppet-unit-3.4-legacy-centos-7
# 3.5 was swiftly replaced with 3.6
- gate-{name}-puppet-unit-3.6-centos-7
- gate-{name}-puppet-unit-3.7-centos-7
- gate-{name}-puppet-unit-3.8-centos-7
- gate-{name}-puppet-unit-3.6-legacy-centos-7
- gate-{name}-puppet-unit-3.7-legacy-centos-7
- gate-{name}-puppet-unit-3.8-legacy-centos-7
- gate-{name}-puppet-unit-4.0-centos-7
- gate-{name}-puppet-unit-4.5-centos-7
- gate-{name}-puppet-unit-latest-centos-7
gate:
- gate-{name}-puppet-unit-3.3-centos-7
- gate-{name}-puppet-unit-3.4-centos-7
- gate-{name}-puppet-unit-3.3-legacy-centos-7
- gate-{name}-puppet-unit-3.4-legacy-centos-7
# 3.5 was swiftly replaced with 3.6
- gate-{name}-puppet-unit-3.6-centos-7
- gate-{name}-puppet-unit-3.7-centos-7
- gate-{name}-puppet-unit-3.8-centos-7
- gate-{name}-puppet-unit-3.6-legacy-centos-7
- gate-{name}-puppet-unit-3.7-legacy-centos-7
- gate-{name}-puppet-unit-3.8-legacy-centos-7
- gate-{name}-puppet-unit-4.0-centos-7
- gate-{name}-puppet-unit-4.5-centos-7
@ -1936,6 +1936,10 @@ jobs:
- ^docs/.*$
branch: ^(?!stable/liberty).*$
# Puppet 3 is not supported in Pike and beyond, so we don't want to test it anymore.
- name: ^gate-(tripleo-heat-templates|tripleo-.*|puppet-.*)-(syntax|unit)-3-legacy-centos-7$
branch: ^(stable/(mitaka|newton|ocata)).*$
# no need to run the jobs for doc / releasenotes / unittests patches
- name: ^gate-(puppet-.*-(syntax|unit|beaker|integration-4)-|(tripleo-ci|scenario.*-tempest)-centos-7-).*$
skip-if: