From 6984cc9f47ab6be89bbaaf2ff6db9ac3758138eb Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 27 Jan 2023 15:52:51 +0900 Subject: [PATCH] Bump puppet version to 7.22 Puppet 7.22 was just released to fix the incompatibility with the latest concurrent-ruby. Let's bump the version used in our CI to unpin the library. Related-Bug: #2003761 Change-Id: I1fe226be4771fa434cc23f359fc0a9aee87e0ee6 --- zuul.d/layout.yaml | 14 +++++++------- zuul.d/libraries.yaml | 8 ++++---- zuul.d/litmus.yaml | 22 +++++++++++----------- zuul.d/unit.yaml | 16 ++++++++-------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 91c8bc709..dffa74157 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -26,19 +26,19 @@ jobs: - puppet-openstack-libraries-puppet-lint-ubuntu-jammy - puppet-openstack-libraries-puppet-syntax-7-ubuntu-jammy - - puppet-openstack-libraries-puppet-unit-7.16-centos-9-stream - - puppet-openstack-libraries-puppet-unit-7.16-ubuntu-jammy + - puppet-openstack-libraries-puppet-unit-7.22-centos-9-stream + - puppet-openstack-libraries-puppet-unit-7.22-ubuntu-jammy - puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy - - puppet-openstack-libraries-litmus-7.16-centos-9-stream - - puppet-openstack-libraries-litmus-7.16-ubuntu-jammy + - puppet-openstack-libraries-litmus-7.22-centos-9-stream + - puppet-openstack-libraries-litmus-7.22-ubuntu-jammy - puppet-openstack-libraries-litmus-latest-ubuntu-jammy gate: jobs: - puppet-openstack-libraries-puppet-lint-ubuntu-jammy - puppet-openstack-libraries-puppet-syntax-7-ubuntu-jammy - - puppet-openstack-libraries-puppet-unit-7.16-centos-9-stream - - puppet-openstack-libraries-puppet-unit-7.16-ubuntu-jammy - - puppet-openstack-libraries-litmus-7.16-centos-9-stream + - puppet-openstack-libraries-puppet-unit-7.22-centos-9-stream + - puppet-openstack-libraries-puppet-unit-7.22-ubuntu-jammy + - puppet-openstack-libraries-litmus-7.22-centos-9-stream # integration jobs - project-template: diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml index 4cf920312..a4fe7a0a7 100644 --- a/zuul.d/libraries.yaml +++ b/zuul.d/libraries.yaml @@ -2,20 +2,20 @@ # This file contains the jobs for the puppet openstack libraries # - job: - name: puppet-openstack-libraries-puppet-unit-7.16-centos-9-stream + name: puppet-openstack-libraries-puppet-unit-7.22-centos-9-stream parent: puppet-openstack-libraries-puppet-unit-base nodeset: centos-9-stream vars: - puppet_gem_version: 7.16.0 + puppet_gem_version: 7.22.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-7.16-ubuntu-jammy + name: puppet-openstack-libraries-puppet-unit-7.22-ubuntu-jammy parent: puppet-openstack-libraries-puppet-unit-base nodeset: ubuntu-jammy vars: - puppet_gem_version: 7.16.0 + puppet_gem_version: 7.22.0 # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support rspec_puppet_version: '~> 2.10.0' diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml index 17193726c..bdeb37768 100644 --- a/zuul.d/litmus.yaml +++ b/zuul.d/litmus.yaml @@ -41,19 +41,19 @@ run: playbooks/run-libraries-litmus-tests.yaml - job: - name: puppet-openstack-litmus-7.16-centos-9-stream + name: puppet-openstack-litmus-7.22-centos-9-stream parent: puppet-openstack-litmus-module-base nodeset: centos-9-stream vars: - puppet_gem_version: 7.16.0 + puppet_gem_version: 7.22.0 - job: - name: puppet-openstack-litmus-7.16-ubuntu-jammy + name: puppet-openstack-litmus-7.22-ubuntu-jammy parent: puppet-openstack-litmus-module-base nodeset: ubuntu-jammy voting: false vars: - puppet_gem_version: 7.16.0 + puppet_gem_version: 7.22.0 - job: name: puppet-openstack-litmus-latest-ubuntu-jammy @@ -64,19 +64,19 @@ puppet_gem_version: latest - job: - name: puppet-openstack-libraries-litmus-7.16-centos-9-stream + name: puppet-openstack-libraries-litmus-7.22-centos-9-stream parent: puppet-openstack-litmus-libraries-base nodeset: centos-9-stream vars: - puppet_gem_version: 7.16.0 + puppet_gem_version: 7.22.0 - job: - name: puppet-openstack-libraries-litmus-7.16-ubuntu-jammy + name: puppet-openstack-libraries-litmus-7.22-ubuntu-jammy parent: puppet-openstack-litmus-libraries-base voting: false nodeset: ubuntu-jammy vars: - puppet_gem_version: 7.16.0 + puppet_gem_version: 7.22.0 - job: name: puppet-openstack-libraries-litmus-latest-ubuntu-jammy @@ -90,9 +90,9 @@ name: puppet-openstack-litmus-jobs check: jobs: - - puppet-openstack-litmus-7.16-centos-9-stream - - puppet-openstack-litmus-7.16-ubuntu-jammy + - puppet-openstack-litmus-7.22-centos-9-stream + - puppet-openstack-litmus-7.22-ubuntu-jammy - puppet-openstack-litmus-latest-ubuntu-jammy gate: jobs: - - puppet-openstack-litmus-7.16-centos-9-stream + - puppet-openstack-litmus-7.22-centos-9-stream diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml index addb52576..1752ed3f8 100644 --- a/zuul.d/unit.yaml +++ b/zuul.d/unit.yaml @@ -2,20 +2,20 @@ # This file contains the puppet unit job configurations # - job: - name: puppet-openstack-unit-7.16-centos-9-stream + name: puppet-openstack-unit-7.22-centos-9-stream parent: puppet-openstack-unit-base nodeset: centos-9-stream vars: - puppet_gem_version: 7.16.0 + puppet_gem_version: 7.22.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-7.16-ubuntu-jammy + name: puppet-openstack-unit-7.22-ubuntu-jammy parent: puppet-openstack-unit-base nodeset: ubuntu-jammy vars: - puppet_gem_version: 7.16.0 + puppet_gem_version: 7.22.0 # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support rspec_puppet_version: '~> 2.10.0' @@ -33,10 +33,10 @@ name: puppet-openstack-module-unit-jobs check: jobs: - - puppet-openstack-unit-7.16-centos-9-stream - - puppet-openstack-unit-7.16-ubuntu-jammy + - puppet-openstack-unit-7.22-centos-9-stream + - puppet-openstack-unit-7.22-ubuntu-jammy - puppet-openstack-unit-latest-ubuntu-jammy gate: jobs: - - puppet-openstack-unit-7.16-centos-9-stream - - puppet-openstack-unit-7.16-ubuntu-jammy + - puppet-openstack-unit-7.22-centos-9-stream + - puppet-openstack-unit-7.22-ubuntu-jammy