openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Run CentOS jobs with Puppet 7 only 

The jobs with Puppet 7 has been stable and looks ready. Since Puppet 7
is already available since RDO wallaby let's use Puppet 7 as main
runtime in CentOS jobs.

Change-Id: I8af191ce951efa82d00df77013ef8fce321369d1
This commit is contained in:
Takashi Kajinami 2021-08-11 23:30:59 +09:00
parent dfcf3ca712
commit d45f560d8e
3 changed files with 11 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zuul.d/integration.yaml
View File

@ -27,12 +27,6 @@
vars:
scenario: scenario000
- job:
name: puppet-openstack-integration-6-scenario000-tempest-centos-8-stream
parent: puppet-openstack-integration-6-scenario000
voting: false
nodeset: centos-8-stream
- job:
name: puppet-openstack-integration-7-scenario000-tempest-centos-8-stream
parent: puppet-openstack-integration-7-scenario000
@ -61,11 +55,6 @@
nodeset: ubuntu-focal
voting: false
- job:
name: puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
parent: puppet-openstack-integration-6-scenario001
nodeset: centos-8-stream
- job:
name: puppet-openstack-integration-7-scenario001-tempest-centos-8-stream
parent: puppet-openstack-integration-7-scenario001
@ -91,11 +80,6 @@
nodeset: ubuntu-focal
voting: false
- job:
name: puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
parent: puppet-openstack-integration-6-scenario002
nodeset: centos-8-stream
- job:
name: puppet-openstack-integration-7-scenario002-tempest-centos-8-stream
parent: puppet-openstack-integration-7-scenario002
@ -121,11 +105,6 @@
nodeset: ubuntu-focal
voting: false
- job:
name: puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
parent: puppet-openstack-integration-6-scenario003
nodeset: centos-8-stream
- job:
name: puppet-openstack-integration-7-scenario003-tempest-centos-8-stream
parent: puppet-openstack-integration-7-scenario003
@ -153,11 +132,6 @@
nodeset: ubuntu-focal
voting: false
- job:
name: puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
parent: puppet-openstack-integration-6-scenario004
nodeset: centos-8-stream
- job:
name: puppet-openstack-integration-7-scenario004-tempest-centos-8-stream
parent: puppet-openstack-integration-7-scenario004

31
zuul.d/layout.yaml
View File

@ -29,12 +29,10 @@
- puppet-openstack-libraries-puppet-lint-ubuntu-focal
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal
- puppet-openstack-libraries-puppet-syntax-7-ubuntu-focal
- puppet-openstack-libraries-puppet-unit-6.21-centos-8-stream
- puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
- puppet-openstack-libraries-puppet-unit-7.5-centos-8-stream
- puppet-openstack-libraries-puppet-unit-7.5-ubuntu-focal
- puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal
- puppet-openstack-libraries-litmus-6.21-centos-8-stream
- puppet-openstack-libraries-litmus-6.21-ubuntu-focal
- puppet-openstack-libraries-litmus-7.5-centos-8-stream
- puppet-openstack-libraries-litmus-7.5-ubuntu-focal
@ -43,9 +41,9 @@
jobs:
- puppet-openstack-libraries-puppet-lint-ubuntu-focal
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal
- puppet-openstack-libraries-puppet-unit-6.21-centos-8-stream
- puppet-openstack-libraries-puppet-unit-7.5-centos-8-stream
- puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
- puppet-openstack-libraries-litmus-6.21-centos-8-stream
- puppet-openstack-libraries-litmus-7.5-centos-8-stream
# integration jobs
- project-template:
@ -56,11 +54,6 @@
- puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal
- puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal
- puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
- puppet-openstack-integration-6-scenario000-tempest-centos-8-stream
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
- puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
- puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario000-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario001-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario002-tempest-centos-8-stream
@ -68,51 +61,47 @@
- puppet-openstack-integration-7-scenario004-tempest-centos-8-stream
gate:
jobs:
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
- puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
- puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario001-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario002-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario003-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario004-tempest-centos-8-stream
- project-template:
name: puppet-openstack-integration-jobs-scenario001
check:
jobs:
- puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario001-tempest-centos-8-stream
gate:
jobs:
- puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario001-tempest-centos-8-stream
- project-template:
name: puppet-openstack-integration-jobs-scenario002
check:
jobs:
- puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario002-tempest-centos-8-stream
gate:
jobs:
- puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario002-tempest-centos-8-stream
- project-template:
name: puppet-openstack-integration-jobs-scenario003
check:
jobs:
- puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal
- puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario003-tempest-centos-8-stream
gate:
jobs:
- puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario003-tempest-centos-8-stream
- project-template:
name: puppet-openstack-integration-jobs-scenario004
check:
jobs:
- puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
- puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario004-tempest-centos-8-stream
gate:
jobs:
- puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
- puppet-openstack-integration-7-scenario004-tempest-centos-8-stream

18
zuul.d/litmus.yaml
View File

@ -38,14 +38,6 @@
abstract: true
run: playbooks/run-libraries-litmus-tests.yaml
- job:
name: puppet-openstack-litmus-6.21-centos-8-stream
parent: puppet-openstack-litmus-module-base
nodeset: centos-8-stream
vars:
puppet_gem_version: 6.21.1
ceph: octopus
- job:
name: puppet-openstack-litmus-7.5-centos-8-stream
parent: puppet-openstack-litmus-module-base
@ -81,13 +73,6 @@
puppet_gem_version: latest
ceph: octopus
- job:
name: puppet-openstack-libraries-litmus-6.21-centos-8-stream
parent: puppet-openstack-litmus-libraries-base
nodeset: centos-8-stream
vars:
puppet_gem_version: 6.21.1
- job:
name: puppet-openstack-libraries-litmus-7.5-centos-8-stream
parent: puppet-openstack-litmus-libraries-base
@ -123,12 +108,11 @@
name: puppet-openstack-litmus-jobs
check:
jobs:
- puppet-openstack-litmus-6.21-centos-8-stream
- puppet-openstack-litmus-6.21-ubuntu-focal
- puppet-openstack-litmus-7.5-centos-8-stream
- puppet-openstack-litmus-7.5-ubuntu-focal
- puppet-openstack-litmus-latest-ubuntu-focal
gate:
jobs:
- puppet-openstack-litmus-6.21-centos-8-stream
- puppet-openstack-litmus-7.5-centos-8-stream
- puppet-openstack-litmus-6.21-ubuntu-focal