From ed57a60dccffe3d294314b768bec79707e34b9fa Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 23 Jan 2025 20:44:40 +0900 Subject: [PATCH] Promote puppet 8 jobs Puppet 7 is reaching its EOL very soon. Enable testing with Puppet 8 to prepare complete migration to Puppet 8. Note that litmus jobs are kept non-voting in this step but will later be made voting. Change-Id: I4578a2265f962ec38b7bddb19e0dfbb624d117de --- zuul.d/integration.yaml | 1 - zuul.d/layout.yaml | 38 ++++++++++++-------------------------- zuul.d/libraries.yaml | 5 ++--- zuul.d/litmus.yaml | 12 +++++------- zuul.d/unit.yaml | 8 ++++---- 5 files changed, 23 insertions(+), 41 deletions(-) diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml index f0c3a0284..08a31546a 100644 --- a/zuul.d/integration.yaml +++ b/zuul.d/integration.yaml @@ -117,7 +117,6 @@ name: puppet-openstack-integration-8 parent: puppet-openstack-integration-run-base abstract: true - voting: false vars: puppet: 8 diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 71fd899e3..dc74548c9 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -30,10 +30,11 @@ - puppet-openstack-libraries-puppet-syntax-8-centos-9-stream - puppet-openstack-libraries-puppet-unit-7.32-centos-9-stream - puppet-openstack-libraries-puppet-unit-7.32-ubuntu-jammy - - puppet-openstack-libraries-puppet-unit-8.8-centos-9-stream + - puppet-openstack-libraries-puppet-unit-8.10-centos-9-stream - puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy - puppet-openstack-libraries-litmus-7.32-centos-9-stream - puppet-openstack-libraries-litmus-7.32-ubuntu-jammy + - puppet-openstack-libraries-litmus-8.10-centos-9-stream - puppet-openstack-libraries-litmus-latest-ubuntu-jammy gate: jobs: @@ -42,9 +43,6 @@ - puppet-openstack-libraries-puppet-unit-7.32-centos-9-stream - puppet-openstack-libraries-puppet-unit-7.32-ubuntu-jammy - puppet-openstack-libraries-litmus-7.32-centos-9-stream - experimental: - jobs: - - puppet-openstack-libraries-litmus-8.8-centos-9-stream # integration jobs - project-template: @@ -61,6 +59,11 @@ - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream @@ -68,13 +71,6 @@ - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream - - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream - - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream - - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream - - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream - project-template: name: puppet-openstack-integration-jobs-scenario001 @@ -82,12 +78,10 @@ jobs: - puppet-openstack-integration-7-scenario001-tempest-ubuntu-jammy - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream - project-template: name: puppet-openstack-integration-jobs-scenario002 @@ -95,12 +89,10 @@ jobs: - puppet-openstack-integration-7-scenario002-tempest-ubuntu-jammy - puppet-openstack-integration-7-scenario002-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario002-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream - project-template: name: puppet-openstack-integration-jobs-scenario003 @@ -108,12 +100,10 @@ jobs: - puppet-openstack-integration-7-scenario003-tempest-ubuntu-jammy - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream - project-template: name: puppet-openstack-integration-jobs-scenario004 @@ -121,12 +111,10 @@ jobs: - puppet-openstack-integration-7-scenario004-tempest-ubuntu-jammy - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream - project-template: name: puppet-openstack-integration-jobs-scenario005 @@ -134,9 +122,7 @@ jobs: - puppet-openstack-integration-7-scenario005-tempest-ubuntu-jammy - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml index 1da2ab140..078d0341c 100644 --- a/zuul.d/libraries.yaml +++ b/zuul.d/libraries.yaml @@ -16,12 +16,11 @@ puppet_gem_version: 7.32 - job: - name: puppet-openstack-libraries-puppet-unit-8.8-centos-9-stream + name: puppet-openstack-libraries-puppet-unit-8.10-centos-9-stream parent: puppet-openstack-libraries-puppet-unit-base nodeset: centos-9-stream - voting: false vars: - puppet_gem_version: 8.8 + puppet_gem_version: 8.10 dnf_modules: ruby: 3.1 diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml index 46507e665..20e7d05db 100644 --- a/zuul.d/litmus.yaml +++ b/zuul.d/litmus.yaml @@ -58,12 +58,12 @@ puppet_gem_version: 7.32 - job: - name: puppet-openstack-litmus-8.8-centos-9-stream + name: puppet-openstack-litmus-8.10-centos-9-stream parent: puppet-openstack-litmus-module-base nodeset: centos-9-stream voting: false vars: - puppet_gem_version: 8.8 + puppet_gem_version: 8.10 dnf_modules: ruby: 3.1 @@ -91,12 +91,12 @@ puppet_gem_version: 7.32 - job: - name: puppet-openstack-libraries-litmus-8.8-centos-9-stream + name: puppet-openstack-libraries-litmus-8.10-centos-9-stream parent: puppet-openstack-litmus-libraries-base nodeset: centos-9-stream voting: false vars: - puppet_gem_version: 8.8 + puppet_gem_version: 8.10 dnf_modules: ruby: 3.1 @@ -114,10 +114,8 @@ jobs: - puppet-openstack-litmus-7.32-centos-9-stream - puppet-openstack-litmus-7.32-ubuntu-jammy + - puppet-openstack-litmus-8.10-centos-9-stream - puppet-openstack-litmus-latest-ubuntu-jammy gate: jobs: - puppet-openstack-litmus-7.32-centos-9-stream - experimental: - jobs: - - puppet-openstack-litmus-8.8-centos-9-stream diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml index 0339e1537..2074d8749 100644 --- a/zuul.d/unit.yaml +++ b/zuul.d/unit.yaml @@ -16,12 +16,11 @@ puppet_gem_version: 7.32 - job: - name: puppet-openstack-unit-8.8-centos-9-stream + name: puppet-openstack-unit-8.10-centos-9-stream parent: puppet-openstack-unit-base nodeset: centos-9-stream - voting: false vars: - puppet_gem_version: 8.8 + puppet_gem_version: 8.10 dnf_modules: ruby: 3.1 @@ -39,9 +38,10 @@ jobs: - puppet-openstack-unit-7.32-centos-9-stream - puppet-openstack-unit-7.32-ubuntu-jammy - - puppet-openstack-unit-8.8-centos-9-stream + - puppet-openstack-unit-8.10-centos-9-stream - puppet-openstack-unit-latest-ubuntu-jammy gate: jobs: - puppet-openstack-unit-7.32-centos-9-stream - puppet-openstack-unit-7.32-ubuntu-jammy + - puppet-openstack-unit-8.10-centos-9-stream