From 5594687e0ef04c80c3284ee74ed37ff9e58a7ab0 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 23 Nov 2021 00:28:18 +0900 Subject: [PATCH] Replace CentOS 8 jobs by CentOS 8 Stream jobs CentOS8 is reaching its EOL in the end of this year. Change-Id: Ibbee6c56788ab3935bb9a0e6243c447bd40ea3ab --- zuul.d/integration.yaml | 24 ------------------------ zuul.d/layout.yaml | 26 ++++++++------------------ zuul.d/litmus.yaml | 18 ------------------ 3 files changed, 8 insertions(+), 60 deletions(-) diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml index a51b2aaf5..c306479e5 100644 --- a/zuul.d/integration.yaml +++ b/zuul.d/integration.yaml @@ -20,16 +20,10 @@ nodeset: ubuntu-bionic voting: false -- job: - name: puppet-openstack-integration-6-scenario001-tempest-centos-8 - parent: puppet-openstack-integration-6-scenario001 - nodeset: centos-8 - - job: name: puppet-openstack-integration-6-scenario001-tempest-centos-8-stream parent: puppet-openstack-integration-6-scenario001 nodeset: centos-8-stream - voting: false - job: name: puppet-openstack-integration-6-scenario002 @@ -44,16 +38,10 @@ nodeset: ubuntu-bionic voting: false -- job: - name: puppet-openstack-integration-6-scenario002-tempest-centos-8 - parent: puppet-openstack-integration-6-scenario002 - nodeset: centos-8 - - job: name: puppet-openstack-integration-6-scenario002-tempest-centos-8-stream parent: puppet-openstack-integration-6-scenario002 nodeset: centos-8-stream - voting: false - job: name: puppet-openstack-integration-6-scenario003 @@ -68,16 +56,10 @@ nodeset: ubuntu-bionic voting: false -- job: - name: puppet-openstack-integration-6-scenario003-tempest-centos-8 - parent: puppet-openstack-integration-6-scenario003 - nodeset: centos-8 - - job: name: puppet-openstack-integration-6-scenario003-tempest-centos-8-stream parent: puppet-openstack-integration-6-scenario003 nodeset: centos-8-stream - voting: false - job: name: puppet-openstack-integration-6-scenario004 @@ -93,13 +75,7 @@ nodeset: ubuntu-bionic voting: false -- job: - name: puppet-openstack-integration-6-scenario004-tempest-centos-8 - parent: puppet-openstack-integration-6-scenario004 - nodeset: centos-8 - - job: name: puppet-openstack-integration-6-scenario004-tempest-centos-8-stream parent: puppet-openstack-integration-6-scenario004 nodeset: centos-8-stream - voting: false diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 25b50e363..71faf2506 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -29,7 +29,6 @@ - puppet-openstack-libraries-puppet-unit-6.14-centos-8-stream - puppet-openstack-libraries-puppet-unit-6.14-ubuntu-bionic - puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic - - puppet-openstack-libraries-litmus-centos-8 - puppet-openstack-libraries-litmus-centos-8-stream - puppet-openstack-libraries-litmus-ubuntu-bionic gate: @@ -38,7 +37,6 @@ - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic - puppet-openstack-libraries-puppet-unit-6.14-centos-8-stream - puppet-openstack-libraries-puppet-unit-6.14-ubuntu-bionic - - puppet-openstack-libraries-litmus-centos-8 - puppet-openstack-libraries-litmus-centos-8-stream # integration jobs @@ -50,61 +48,53 @@ - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic - - puppet-openstack-integration-6-scenario001-tempest-centos-8 - - puppet-openstack-integration-6-scenario002-tempest-centos-8 - - puppet-openstack-integration-6-scenario003-tempest-centos-8 - - puppet-openstack-integration-6-scenario004-tempest-centos-8 - 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 gate: jobs: - - puppet-openstack-integration-6-scenario001-tempest-centos-8 - - puppet-openstack-integration-6-scenario002-tempest-centos-8 - - puppet-openstack-integration-6-scenario003-tempest-centos-8 - - puppet-openstack-integration-6-scenario004-tempest-centos-8 + - 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 - project-template: name: puppet-openstack-integration-jobs-scenario001 check: jobs: - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic - - puppet-openstack-integration-6-scenario001-tempest-centos-8 - puppet-openstack-integration-6-scenario001-tempest-centos-8-stream gate: jobs: - - puppet-openstack-integration-6-scenario001-tempest-centos-8 + - puppet-openstack-integration-6-scenario001-tempest-centos-8-stream - project-template: name: puppet-openstack-integration-jobs-scenario002 check: jobs: - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic - - puppet-openstack-integration-6-scenario002-tempest-centos-8 - puppet-openstack-integration-6-scenario002-tempest-centos-8-stream gate: jobs: - - puppet-openstack-integration-6-scenario002-tempest-centos-8 + - puppet-openstack-integration-6-scenario002-tempest-centos-8-stream - project-template: name: puppet-openstack-integration-jobs-scenario003 check: jobs: - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic - - puppet-openstack-integration-6-scenario003-tempest-centos-8 - puppet-openstack-integration-6-scenario003-tempest-centos-8-stream gate: jobs: - - puppet-openstack-integration-6-scenario003-tempest-centos-8 + - puppet-openstack-integration-6-scenario003-tempest-centos-8-stream - project-template: name: puppet-openstack-integration-jobs-scenario004 check: jobs: - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic - - puppet-openstack-integration-6-scenario004-tempest-centos-8 - puppet-openstack-integration-6-scenario004-tempest-centos-8-stream gate: jobs: - - puppet-openstack-integration-6-scenario004-tempest-centos-8 + - puppet-openstack-integration-6-scenario004-tempest-centos-8-stream diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml index 21d001b5d..2e1e7530e 100644 --- a/zuul.d/litmus.yaml +++ b/zuul.d/litmus.yaml @@ -35,19 +35,10 @@ abstract: true run: playbooks/run-libraries-litmus-tests.yaml -- job: - name: puppet-openstack-litmus-centos-8 - parent: puppet-openstack-litmus-module-base - nodeset: centos-8 - vars: - puppet_gem_version: 6.16 - ceph: nautilus - - job: name: puppet-openstack-litmus-centos-8-stream parent: puppet-openstack-litmus-module-base nodeset: centos-8-stream - voting: false vars: puppet_gem_version: 6.16 ceph: nautilus @@ -61,16 +52,9 @@ puppet_gem_version: latest ceph: nautilus -- job: - name: puppet-openstack-libraries-litmus-centos-8 - parent: puppet-openstack-litmus-libraries-base - vars: - puppet_gem_version: 6.18.0 - - job: name: puppet-openstack-libraries-litmus-centos-8-stream parent: puppet-openstack-litmus-libraries-base - voting: false nodeset: centos-8-stream vars: puppet_gem_version: 6.18.0 @@ -87,11 +71,9 @@ name: puppet-openstack-litmus-jobs check: jobs: - - puppet-openstack-litmus-centos-8 - puppet-openstack-litmus-centos-8-stream - puppet-openstack-litmus-ubuntu-bionic gate: jobs: - - puppet-openstack-litmus-centos-8 - puppet-openstack-litmus-centos-8-stream - puppet-openstack-litmus-ubuntu-bionic