From 7e6080c1752cb834197b7df9e15074c692d72732 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 27 Jan 2022 00:17:52 +0900 Subject: [PATCH] Bump Puppet 7 version from 7.8 to 7.10 ... following the version provided by RDO. It is known that Puppet >= 7.10.0 or >=6.25.0 is required to avoid the wrong service provider used in CentOS9[1]. [1] https://tickets.puppetlabs.com/browse/PUP-11433 Change-Id: I7cb23b2179292164ddcd2909773d05cacbb334f4 --- zuul.d/layout.yaml | 12 ++++++------ zuul.d/libraries.yaml | 8 ++++---- zuul.d/litmus.yaml | 22 +++++++++++----------- zuul.d/unit.yaml | 16 ++++++++-------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index b938ec096..59975ff77 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -30,20 +30,20 @@ - 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.8-centos-8-stream - - puppet-openstack-libraries-puppet-unit-7.8-ubuntu-focal + - puppet-openstack-libraries-puppet-unit-7.10-centos-8-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 - - puppet-openstack-libraries-litmus-7.8-centos-8-stream - - puppet-openstack-libraries-litmus-7.8-ubuntu-focal + - puppet-openstack-libraries-litmus-7.10-centos-8-stream + - puppet-openstack-libraries-litmus-7.10-ubuntu-focal - puppet-openstack-libraries-litmus-latest-ubuntu-focal gate: jobs: - puppet-openstack-libraries-puppet-lint-ubuntu-focal - puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal - - puppet-openstack-libraries-puppet-unit-7.8-centos-8-stream + - puppet-openstack-libraries-puppet-unit-7.10-centos-8-stream - puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal - - puppet-openstack-libraries-litmus-7.8-centos-8-stream + - puppet-openstack-libraries-litmus-7.10-centos-8-stream # integration jobs - project-template: diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml index 57c4750dc..0b4bc3113 100644 --- a/zuul.d/libraries.yaml +++ b/zuul.d/libraries.yaml @@ -9,11 +9,11 @@ puppet_gem_version: 6.21.1 - job: - name: puppet-openstack-libraries-puppet-unit-7.8-centos-8-stream + name: puppet-openstack-libraries-puppet-unit-7.10-centos-8-stream parent: puppet-openstack-libraries-puppet-unit-base nodeset: centos-8-stream vars: - puppet_gem_version: 7.8.0 + puppet_gem_version: 7.10.0 - job: name: puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal @@ -24,11 +24,11 @@ rspec_puppet_version: '= 2.8.0' - job: - name: puppet-openstack-libraries-puppet-unit-7.8-ubuntu-focal + name: puppet-openstack-libraries-puppet-unit-7.10-ubuntu-focal parent: puppet-openstack-libraries-puppet-unit-base nodeset: ubuntu-focal vars: - puppet_gem_version: 7.8.0 + puppet_gem_version: 7.10.0 rspec_puppet_version: '= 2.8.0' - job: diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml index c04a2c6ee..f6c6dacd7 100644 --- a/zuul.d/litmus.yaml +++ b/zuul.d/litmus.yaml @@ -39,11 +39,11 @@ run: playbooks/run-libraries-litmus-tests.yaml - job: - name: puppet-openstack-litmus-7.8-centos-8-stream + name: puppet-openstack-litmus-7.10-centos-8-stream parent: puppet-openstack-litmus-module-base nodeset: centos-8-stream vars: - puppet_gem_version: 7.8.0 + puppet_gem_version: 7.10.0 ceph: pacific - job: @@ -56,12 +56,12 @@ ceph: pacific - job: - name: puppet-openstack-litmus-7.8-ubuntu-focal + name: puppet-openstack-litmus-7.10-ubuntu-focal parent: puppet-openstack-litmus-module-base nodeset: ubuntu-focal voting: false vars: - puppet_gem_version: 7.8.0 + puppet_gem_version: 7.10.0 ceph: pacific - job: @@ -74,11 +74,11 @@ ceph: pacific - job: - name: puppet-openstack-libraries-litmus-7.8-centos-8-stream + name: puppet-openstack-libraries-litmus-7.10-centos-8-stream parent: puppet-openstack-litmus-libraries-base nodeset: centos-8-stream vars: - puppet_gem_version: 7.8.0 + puppet_gem_version: 7.10.0 - job: name: puppet-openstack-libraries-litmus-6.21-ubuntu-focal @@ -89,12 +89,12 @@ puppet_gem_version: 6.21.1 - job: - name: puppet-openstack-libraries-litmus-7.8-ubuntu-focal + name: puppet-openstack-libraries-litmus-7.10-ubuntu-focal parent: puppet-openstack-litmus-libraries-base voting: false nodeset: ubuntu-focal vars: - puppet_gem_version: 7.8.0 + puppet_gem_version: 7.10.0 - job: name: puppet-openstack-libraries-litmus-latest-ubuntu-focal @@ -109,10 +109,10 @@ check: jobs: - puppet-openstack-litmus-6.21-ubuntu-focal - - puppet-openstack-litmus-7.8-centos-8-stream - - puppet-openstack-litmus-7.8-ubuntu-focal + - puppet-openstack-litmus-7.10-centos-8-stream + - puppet-openstack-litmus-7.10-ubuntu-focal - puppet-openstack-litmus-latest-ubuntu-focal gate: jobs: - - puppet-openstack-litmus-7.8-centos-8-stream + - puppet-openstack-litmus-7.10-centos-8-stream - puppet-openstack-litmus-6.21-ubuntu-focal diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml index 68e97063e..be187ba7f 100644 --- a/zuul.d/unit.yaml +++ b/zuul.d/unit.yaml @@ -9,11 +9,11 @@ puppet_gem_version: 6.21.1 - job: - name: puppet-openstack-unit-7.8-centos-8-stream + name: puppet-openstack-unit-7.10-centos-8-stream parent: puppet-openstack-unit-base nodeset: centos-8-stream vars: - puppet_gem_version: 7.8.0 + puppet_gem_version: 7.10.0 - job: name: puppet-openstack-unit-6.21-ubuntu-focal @@ -24,11 +24,11 @@ rspec_puppet_version: '= 2.8.0' - job: - name: puppet-openstack-unit-7.8-ubuntu-focal + name: puppet-openstack-unit-7.10-ubuntu-focal parent: puppet-openstack-unit-base nodeset: ubuntu-focal vars: - puppet_gem_version: 7.8.0 + puppet_gem_version: 7.10.0 rspec_puppet_version: '= 2.8.0' - job: @@ -45,13 +45,13 @@ check: jobs: - puppet-openstack-unit-6.21-centos-8-stream - - puppet-openstack-unit-7.8-centos-8-stream + - puppet-openstack-unit-7.10-centos-8-stream - puppet-openstack-unit-6.21-ubuntu-focal - - puppet-openstack-unit-7.8-ubuntu-focal + - puppet-openstack-unit-7.10-ubuntu-focal - puppet-openstack-unit-latest-ubuntu-focal gate: jobs: - puppet-openstack-unit-6.21-centos-8-stream - - puppet-openstack-unit-7.8-centos-8-stream + - puppet-openstack-unit-7.10-centos-8-stream - puppet-openstack-unit-6.21-ubuntu-focal - - puppet-openstack-unit-7.8-ubuntu-focal + - puppet-openstack-unit-7.10-ubuntu-focal