From 5a113b3b09aa52119d7c8a926905ee232e70d2b0 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 7 Apr 2022 20:32:11 +0900 Subject: [PATCH] Migrate unit tests to CentOS 9 Stream RDO no longer supports CentOS 8 Stream since Zed, and functional jobs are being migrated to CentOS 9 Stream. Following that migration, this change migrates unit tests to CentOS 9 Stream, to reduce OS versions we use in CI. Change-Id: I93cc7545728fd6dde89399d8a57763137dd24f55 --- zuul.d/layout.yaml | 4 ++-- zuul.d/libraries.yaml | 6 ++++-- zuul.d/unit.yaml | 10 ++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 4bcf772c8..199de5a8d 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -30,7 +30,7 @@ - puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal - puppet-openstack-libraries-puppet-syntax-7-ubuntu-focal - puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal - - puppet-openstack-libraries-puppet-unit-7.10-centos-8-stream + - puppet-openstack-libraries-puppet-unit-7.10-centos-9-stream - puppet-openstack-libraries-puppet-unit-7.10-ubuntu-focal - puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal - puppet-openstack-libraries-litmus-6.21-ubuntu-focal @@ -43,7 +43,7 @@ - puppet-openstack-libraries-puppet-lint-ubuntu-focal - puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal - puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal - - puppet-openstack-libraries-puppet-unit-7.10-centos-8-stream + - puppet-openstack-libraries-puppet-unit-7.10-centos-9-stream - puppet-openstack-libraries-litmus-7.10-centos-8-stream # integration jobs diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml index 93443dba8..f4b356835 100644 --- a/zuul.d/libraries.yaml +++ b/zuul.d/libraries.yaml @@ -2,11 +2,13 @@ # This file contains the jobs for the puppet openstack libraries # - job: - name: puppet-openstack-libraries-puppet-unit-7.10-centos-8-stream + name: puppet-openstack-libraries-puppet-unit-7.10-centos-9-stream parent: puppet-openstack-libraries-puppet-unit-base - nodeset: centos-8-stream + nodeset: centos-9-stream vars: puppet_gem_version: 7.10.0 + # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support + rspec_puppet_version: '= 2.10.0' - job: name: puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml index 3133dc5b5..eeb8f3141 100644 --- a/zuul.d/unit.yaml +++ b/zuul.d/unit.yaml @@ -2,11 +2,13 @@ # This file contains the puppet unit job configurations # - job: - name: puppet-openstack-unit-7.10-centos-8-stream + name: puppet-openstack-unit-7.10-centos-9-stream parent: puppet-openstack-unit-base - nodeset: centos-8-stream + nodeset: centos-9-stream vars: puppet_gem_version: 7.10.0 + # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support + rspec_puppet_version: '= 2.10.0' - job: name: puppet-openstack-unit-6.21-ubuntu-focal @@ -37,12 +39,12 @@ name: puppet-openstack-module-unit-jobs check: jobs: - - puppet-openstack-unit-7.10-centos-8-stream + - puppet-openstack-unit-7.10-centos-9-stream - puppet-openstack-unit-6.21-ubuntu-focal - puppet-openstack-unit-7.10-ubuntu-focal - puppet-openstack-unit-latest-ubuntu-focal gate: jobs: - - puppet-openstack-unit-7.10-centos-8-stream + - puppet-openstack-unit-7.10-centos-9-stream - puppet-openstack-unit-6.21-ubuntu-focal - puppet-openstack-unit-7.10-ubuntu-focal