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
This commit is contained in:
Takashi Kajinami 2023-01-27 15:52:51 +09:00
parent b27e3a7c6a
commit 6984cc9f47
4 changed files with 30 additions and 30 deletions

View File

@ -26,19 +26,19 @@
jobs: jobs:
- puppet-openstack-libraries-puppet-lint-ubuntu-jammy - puppet-openstack-libraries-puppet-lint-ubuntu-jammy
- puppet-openstack-libraries-puppet-syntax-7-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.22-centos-9-stream
- puppet-openstack-libraries-puppet-unit-7.16-ubuntu-jammy - puppet-openstack-libraries-puppet-unit-7.22-ubuntu-jammy
- puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy - puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy
- puppet-openstack-libraries-litmus-7.16-centos-9-stream - puppet-openstack-libraries-litmus-7.22-centos-9-stream
- puppet-openstack-libraries-litmus-7.16-ubuntu-jammy - puppet-openstack-libraries-litmus-7.22-ubuntu-jammy
- puppet-openstack-libraries-litmus-latest-ubuntu-jammy - puppet-openstack-libraries-litmus-latest-ubuntu-jammy
gate: gate:
jobs: jobs:
- puppet-openstack-libraries-puppet-lint-ubuntu-jammy - puppet-openstack-libraries-puppet-lint-ubuntu-jammy
- puppet-openstack-libraries-puppet-syntax-7-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.22-centos-9-stream
- puppet-openstack-libraries-puppet-unit-7.16-ubuntu-jammy - puppet-openstack-libraries-puppet-unit-7.22-ubuntu-jammy
- puppet-openstack-libraries-litmus-7.16-centos-9-stream - puppet-openstack-libraries-litmus-7.22-centos-9-stream
# integration jobs # integration jobs
- project-template: - project-template:

View File

@ -2,20 +2,20 @@
# This file contains the jobs for the puppet openstack libraries # This file contains the jobs for the puppet openstack libraries
# #
- job: - 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 parent: puppet-openstack-libraries-puppet-unit-base
nodeset: centos-9-stream nodeset: centos-9-stream
vars: 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 # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
rspec_puppet_version: '~> 2.10.0' rspec_puppet_version: '~> 2.10.0'
- job: - 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 parent: puppet-openstack-libraries-puppet-unit-base
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
vars: 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 # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
rspec_puppet_version: '~> 2.10.0' rspec_puppet_version: '~> 2.10.0'

View File

@ -41,19 +41,19 @@
run: playbooks/run-libraries-litmus-tests.yaml run: playbooks/run-libraries-litmus-tests.yaml
- job: - 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 parent: puppet-openstack-litmus-module-base
nodeset: centos-9-stream nodeset: centos-9-stream
vars: vars:
puppet_gem_version: 7.16.0 puppet_gem_version: 7.22.0
- job: - job:
name: puppet-openstack-litmus-7.16-ubuntu-jammy name: puppet-openstack-litmus-7.22-ubuntu-jammy
parent: puppet-openstack-litmus-module-base parent: puppet-openstack-litmus-module-base
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
voting: false voting: false
vars: vars:
puppet_gem_version: 7.16.0 puppet_gem_version: 7.22.0
- job: - job:
name: puppet-openstack-litmus-latest-ubuntu-jammy name: puppet-openstack-litmus-latest-ubuntu-jammy
@ -64,19 +64,19 @@
puppet_gem_version: latest puppet_gem_version: latest
- job: - 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 parent: puppet-openstack-litmus-libraries-base
nodeset: centos-9-stream nodeset: centos-9-stream
vars: vars:
puppet_gem_version: 7.16.0 puppet_gem_version: 7.22.0
- job: - 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 parent: puppet-openstack-litmus-libraries-base
voting: false voting: false
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
vars: vars:
puppet_gem_version: 7.16.0 puppet_gem_version: 7.22.0
- job: - job:
name: puppet-openstack-libraries-litmus-latest-ubuntu-jammy name: puppet-openstack-libraries-litmus-latest-ubuntu-jammy
@ -90,9 +90,9 @@
name: puppet-openstack-litmus-jobs name: puppet-openstack-litmus-jobs
check: check:
jobs: jobs:
- puppet-openstack-litmus-7.16-centos-9-stream - puppet-openstack-litmus-7.22-centos-9-stream
- puppet-openstack-litmus-7.16-ubuntu-jammy - puppet-openstack-litmus-7.22-ubuntu-jammy
- puppet-openstack-litmus-latest-ubuntu-jammy - puppet-openstack-litmus-latest-ubuntu-jammy
gate: gate:
jobs: jobs:
- puppet-openstack-litmus-7.16-centos-9-stream - puppet-openstack-litmus-7.22-centos-9-stream

View File

@ -2,20 +2,20 @@
# This file contains the puppet unit job configurations # This file contains the puppet unit job configurations
# #
- job: - job:
name: puppet-openstack-unit-7.16-centos-9-stream name: puppet-openstack-unit-7.22-centos-9-stream
parent: puppet-openstack-unit-base parent: puppet-openstack-unit-base
nodeset: centos-9-stream nodeset: centos-9-stream
vars: 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 # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
rspec_puppet_version: '~> 2.10.0' rspec_puppet_version: '~> 2.10.0'
- job: - job:
name: puppet-openstack-unit-7.16-ubuntu-jammy name: puppet-openstack-unit-7.22-ubuntu-jammy
parent: puppet-openstack-unit-base parent: puppet-openstack-unit-base
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
vars: 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 # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
rspec_puppet_version: '~> 2.10.0' rspec_puppet_version: '~> 2.10.0'
@ -33,10 +33,10 @@
name: puppet-openstack-module-unit-jobs name: puppet-openstack-module-unit-jobs
check: check:
jobs: jobs:
- puppet-openstack-unit-7.16-centos-9-stream - puppet-openstack-unit-7.22-centos-9-stream
- puppet-openstack-unit-7.16-ubuntu-jammy - puppet-openstack-unit-7.22-ubuntu-jammy
- puppet-openstack-unit-latest-ubuntu-jammy - puppet-openstack-unit-latest-ubuntu-jammy
gate: gate:
jobs: jobs:
- puppet-openstack-unit-7.16-centos-9-stream - puppet-openstack-unit-7.22-centos-9-stream
- puppet-openstack-unit-7.16-ubuntu-jammy - puppet-openstack-unit-7.22-ubuntu-jammy