Replace Ubuntu Jammy by Noble
Move integration jobs to Noble because Ubuntu no longer provides new OpenStack releases for Jammy. Caracal is the last release available for Jammy. Also switch puppet 8 job to Noble because default ruby package in Noble meets the requirement. Change-Id: Id8efa431609492ca483e570a85f787acbc855a9d
This commit is contained in:
Takashi Kajinami
parent
6fc72cab31
commit
b30055d0f5
@ -7,6 +7,9 @@ class openstack_integration::repos {
|
||||
include apt
|
||||
class { 'openstack_extras::repo::debian::ubuntu':
|
||||
release => 'caracal',
|
||||
# TODO(tkajinam): Switch to UCA once openstackclient in Dalmatian
|
||||
# is updated. See https://bugs.launchpad.net/bugs/2097764 .
|
||||
manage_uca => false,
|
||||
package_require => true,
|
||||
uca_location => pick($facts['uca_mirror_host'], 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
|
||||
}
|
||||
|
||||
@ -79,7 +79,7 @@
|
||||
name: puppet-openstack-base
|
||||
pre-run: playbooks/prepare-node-common.yaml
|
||||
abstract: true
|
||||
nodeset: ubuntu-jammy
|
||||
nodeset: ubuntu-noble
|
||||
vars:
|
||||
puppet: 7
|
||||
|
||||
|
||||
@ -13,12 +13,6 @@
|
||||
vars:
|
||||
scenario: scenario001
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-7-scenario001-tempest-ubuntu-jammy
|
||||
parent: puppet-openstack-integration-7-scenario001
|
||||
nodeset: ubuntu-jammy
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
|
||||
parent: puppet-openstack-integration-7-scenario001
|
||||
@ -34,12 +28,6 @@
|
||||
vars:
|
||||
scenario: scenario002
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-7-scenario002-tempest-ubuntu-jammy
|
||||
parent: puppet-openstack-integration-7-scenario002
|
||||
nodeset: ubuntu-jammy
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-7-scenario002-tempest-centos-9-stream
|
||||
parent: puppet-openstack-integration-7-scenario002
|
||||
@ -55,12 +43,6 @@
|
||||
vars:
|
||||
scenario: scenario003
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-7-scenario003-tempest-ubuntu-jammy
|
||||
parent: puppet-openstack-integration-7-scenario003
|
||||
nodeset: ubuntu-jammy
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-7-scenario003-tempest-centos-9-stream
|
||||
parent: puppet-openstack-integration-7-scenario003
|
||||
@ -76,12 +58,6 @@
|
||||
vars:
|
||||
scenario: scenario004
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-7-scenario004-tempest-ubuntu-jammy
|
||||
parent: puppet-openstack-integration-7-scenario004
|
||||
nodeset: ubuntu-jammy
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-7-scenario004-tempest-centos-9-stream
|
||||
parent: puppet-openstack-integration-7-scenario004
|
||||
@ -97,12 +73,6 @@
|
||||
vars:
|
||||
scenario: scenario005
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-7-scenario005-tempest-ubuntu-jammy
|
||||
parent: puppet-openstack-integration-7-scenario005
|
||||
nodeset: ubuntu-jammy
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-7-scenario005-tempest-centos-9-stream
|
||||
parent: puppet-openstack-integration-7-scenario005
|
||||
@ -128,12 +98,10 @@
|
||||
scenario: scenario001
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-8-scenario001-tempest-centos-9-stream
|
||||
name: puppet-openstack-integration-8-scenario001-tempest-ubuntu-noble
|
||||
parent: puppet-openstack-integration-8-scenario001
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: centos-9-stream
|
||||
label: centos-9-stream
|
||||
nodeset: ubuntu-noble
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-8-scenario002
|
||||
@ -143,12 +111,10 @@
|
||||
scenario: scenario002
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-8-scenario002-tempest-centos-9-stream
|
||||
name: puppet-openstack-integration-8-scenario002-tempest-ubuntu-noble
|
||||
parent: puppet-openstack-integration-8-scenario002
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: centos-9-stream
|
||||
label: centos-9-stream
|
||||
nodeset: ubuntu-noble
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-8-scenario003
|
||||
@ -158,12 +124,10 @@
|
||||
scenario: scenario003
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-8-scenario003-tempest-centos-9-stream
|
||||
name: puppet-openstack-integration-8-scenario003-tempest-ubuntu-noble
|
||||
parent: puppet-openstack-integration-8-scenario003
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: centos-9-stream
|
||||
label: centos-9-stream
|
||||
nodeset: ubuntu-noble
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-8-scenario004
|
||||
@ -173,12 +137,10 @@
|
||||
scenario: scenario004
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-8-scenario004-tempest-centos-9-stream
|
||||
name: puppet-openstack-integration-8-scenario004-tempest-ubuntu-noble
|
||||
parent: puppet-openstack-integration-8-scenario004
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: centos-9-stream
|
||||
label: centos-9-stream
|
||||
nodeset: ubuntu-noble
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-8-scenario005
|
||||
@ -188,9 +150,7 @@
|
||||
scenario: scenario005
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-integration-8-scenario005-tempest-centos-9-stream
|
||||
name: puppet-openstack-integration-8-scenario005-tempest-ubuntu-noble
|
||||
parent: puppet-openstack-integration-8-scenario005
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: centos-9-stream
|
||||
label: centos-9-stream
|
||||
nodeset: ubuntu-noble
|
||||
voting: false
|
||||
|
||||
@ -7,13 +7,14 @@
|
||||
name: puppet-openstack-check-jobs
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-lint-ubuntu-jammy
|
||||
- puppet-openstack-syntax-7-ubuntu-jammy
|
||||
- puppet-openstack-syntax-8-centos-9-stream
|
||||
- puppet-openstack-lint-ubuntu-noble
|
||||
- puppet-openstack-syntax-7-ubuntu-noble
|
||||
- puppet-openstack-syntax-8-ubuntu-noble
|
||||
gate:
|
||||
jobs:
|
||||
- puppet-openstack-lint-ubuntu-jammy
|
||||
- puppet-openstack-syntax-7-ubuntu-jammy
|
||||
- puppet-openstack-lint-ubuntu-noble
|
||||
- puppet-openstack-syntax-7-ubuntu-noble
|
||||
- puppet-openstack-syntax-8-ubuntu-noble
|
||||
|
||||
- project:
|
||||
templates:
|
||||
@ -25,23 +26,22 @@
|
||||
name: puppet-openstack-library-jobs
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-libraries-puppet-lint-ubuntu-jammy
|
||||
- puppet-openstack-libraries-puppet-syntax-7-ubuntu-jammy
|
||||
- puppet-openstack-libraries-puppet-syntax-8-centos-9-stream
|
||||
- puppet-openstack-libraries-puppet-lint-ubuntu-noble
|
||||
- puppet-openstack-libraries-puppet-syntax-7-ubuntu-noble
|
||||
- puppet-openstack-libraries-puppet-syntax-8-ubuntu-noble
|
||||
- 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.10-centos-9-stream
|
||||
- puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy
|
||||
- puppet-openstack-libraries-puppet-unit-8.10-ubuntu-noble
|
||||
- puppet-openstack-libraries-puppet-unit-latest-ubuntu-noble
|
||||
- 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
|
||||
- puppet-openstack-libraries-litmus-8.10-ubuntu-noble
|
||||
- puppet-openstack-libraries-litmus-latest-ubuntu-noble
|
||||
gate:
|
||||
jobs:
|
||||
- puppet-openstack-libraries-puppet-lint-ubuntu-jammy
|
||||
- puppet-openstack-libraries-puppet-syntax-7-ubuntu-jammy
|
||||
- puppet-openstack-libraries-puppet-lint-ubuntu-noble
|
||||
- puppet-openstack-libraries-puppet-syntax-7-ubuntu-noble
|
||||
- puppet-openstack-libraries-puppet-syntax-8-ubuntu-noble
|
||||
- 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.10-ubuntu-noble
|
||||
- puppet-openstack-libraries-litmus-7.32-centos-9-stream
|
||||
|
||||
# integration jobs
|
||||
@ -49,11 +49,11 @@
|
||||
name: puppet-openstack-integration-jobs-all
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-integration-7-scenario001-tempest-ubuntu-jammy
|
||||
- puppet-openstack-integration-7-scenario002-tempest-ubuntu-jammy
|
||||
- puppet-openstack-integration-7-scenario003-tempest-ubuntu-jammy
|
||||
- puppet-openstack-integration-7-scenario004-tempest-ubuntu-jammy
|
||||
- puppet-openstack-integration-7-scenario005-tempest-ubuntu-jammy
|
||||
- puppet-openstack-integration-8-scenario001-tempest-ubuntu-noble
|
||||
- puppet-openstack-integration-8-scenario002-tempest-ubuntu-noble
|
||||
- puppet-openstack-integration-8-scenario003-tempest-ubuntu-noble
|
||||
- puppet-openstack-integration-8-scenario004-tempest-ubuntu-noble
|
||||
- puppet-openstack-integration-8-scenario005-tempest-ubuntu-noble
|
||||
- puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
|
||||
- puppet-openstack-integration-7-scenario002-tempest-centos-9-stream
|
||||
- puppet-openstack-integration-7-scenario003-tempest-centos-9-stream
|
||||
@ -76,7 +76,7 @@
|
||||
name: puppet-openstack-integration-jobs-scenario001
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-integration-7-scenario001-tempest-ubuntu-jammy
|
||||
- puppet-openstack-integration-8-scenario001-tempest-ubuntu-noble
|
||||
- puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
|
||||
- puppet-openstack-integration-8-scenario001-tempest-centos-9-stream
|
||||
gate:
|
||||
@ -87,7 +87,7 @@
|
||||
name: puppet-openstack-integration-jobs-scenario002
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-integration-7-scenario002-tempest-ubuntu-jammy
|
||||
- puppet-openstack-integration-8-scenario002-tempest-ubuntu-noble
|
||||
- puppet-openstack-integration-7-scenario002-tempest-centos-9-stream
|
||||
- puppet-openstack-integration-8-scenario002-tempest-centos-9-stream
|
||||
gate:
|
||||
@ -98,7 +98,7 @@
|
||||
name: puppet-openstack-integration-jobs-scenario003
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-integration-7-scenario003-tempest-ubuntu-jammy
|
||||
- puppet-openstack-integration-8-scenario003-tempest-ubuntu-noble
|
||||
- puppet-openstack-integration-7-scenario003-tempest-centos-9-stream
|
||||
- puppet-openstack-integration-8-scenario003-tempest-centos-9-stream
|
||||
gate:
|
||||
@ -109,7 +109,7 @@
|
||||
name: puppet-openstack-integration-jobs-scenario004
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-integration-7-scenario004-tempest-ubuntu-jammy
|
||||
- puppet-openstack-integration-8-scenario004-tempest-ubuntu-noble
|
||||
- puppet-openstack-integration-7-scenario004-tempest-centos-9-stream
|
||||
- puppet-openstack-integration-8-scenario004-tempest-centos-9-stream
|
||||
gate:
|
||||
@ -120,7 +120,7 @@
|
||||
name: puppet-openstack-integration-jobs-scenario005
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-integration-7-scenario005-tempest-ubuntu-jammy
|
||||
- puppet-openstack-integration-8-scenario005-tempest-ubuntu-noble
|
||||
- puppet-openstack-integration-7-scenario005-tempest-centos-9-stream
|
||||
- puppet-openstack-integration-8-scenario005-tempest-centos-9-stream
|
||||
gate:
|
||||
|
||||
@ -9,25 +9,16 @@
|
||||
puppet_gem_version: 7.32
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-libraries-puppet-unit-7.32-ubuntu-jammy
|
||||
name: puppet-openstack-libraries-puppet-unit-8.10-ubuntu-noble
|
||||
parent: puppet-openstack-libraries-puppet-unit-base
|
||||
nodeset: ubuntu-jammy
|
||||
vars:
|
||||
puppet_gem_version: 7.32
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-libraries-puppet-unit-8.10-centos-9-stream
|
||||
parent: puppet-openstack-libraries-puppet-unit-base
|
||||
nodeset: centos-9-stream
|
||||
nodeset: ubuntu-noble
|
||||
vars:
|
||||
puppet_gem_version: 8.10
|
||||
dnf_modules:
|
||||
ruby: 3.1
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy
|
||||
name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-noble
|
||||
parent: puppet-openstack-libraries-puppet-unit-base
|
||||
nodeset: ubuntu-jammy
|
||||
nodeset: ubuntu-noble
|
||||
voting: false
|
||||
vars:
|
||||
puppet_gem_version: latest
|
||||
|
||||
@ -1,42 +1,34 @@
|
||||
---
|
||||
- job:
|
||||
name: puppet-openstack-lint-ubuntu-jammy
|
||||
name: puppet-openstack-lint-ubuntu-noble
|
||||
parent: puppet-openstack-module-base
|
||||
run: playbooks/run-lint-tests.yaml
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-syntax-7-ubuntu-jammy
|
||||
name: puppet-openstack-syntax-7-ubuntu-noble
|
||||
parent: puppet-openstack-syntax-base
|
||||
vars:
|
||||
puppet: 7
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-syntax-8-centos-9-stream
|
||||
name: puppet-openstack-syntax-8-ubuntu-noble
|
||||
parent: puppet-openstack-syntax-base
|
||||
nodeset: centos-9-stream
|
||||
voting: false
|
||||
vars:
|
||||
puppet: 8
|
||||
dnf_modules:
|
||||
ruby: 3.1
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-libraries-puppet-lint-ubuntu-jammy
|
||||
name: puppet-openstack-libraries-puppet-lint-ubuntu-noble
|
||||
parent: puppet-openstack-module-base
|
||||
run: playbooks/run-libraries-lint-tests.yaml
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-libraries-puppet-syntax-7-ubuntu-jammy
|
||||
name: puppet-openstack-libraries-puppet-syntax-7-ubuntu-noble
|
||||
parent: puppet-openstack-libraries-puppet-syntax-base
|
||||
vars:
|
||||
puppet: 7
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-libraries-puppet-syntax-8-centos-9-stream
|
||||
name: puppet-openstack-libraries-puppet-syntax-8-ubuntu-noble
|
||||
parent: puppet-openstack-libraries-puppet-syntax-base
|
||||
nodeset: centos-9-stream
|
||||
voting: false
|
||||
vars:
|
||||
puppet: 8
|
||||
dnf_modules:
|
||||
ruby: 3.1
|
||||
|
||||
@ -50,26 +50,17 @@
|
||||
puppet_gem_version: 7.32
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-litmus-7.32-ubuntu-jammy
|
||||
name: puppet-openstack-litmus-8.10-ubuntu-noble
|
||||
parent: puppet-openstack-litmus-module-base
|
||||
nodeset: ubuntu-jammy
|
||||
nodeset: ubuntu-noble
|
||||
voting: false
|
||||
vars:
|
||||
puppet_gem_version: 7.32
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-litmus-8.10-centos-9-stream
|
||||
parent: puppet-openstack-litmus-module-base
|
||||
nodeset: centos-9-stream
|
||||
vars:
|
||||
puppet_gem_version: 8.10
|
||||
dnf_modules:
|
||||
ruby: 3.1
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-litmus-latest-ubuntu-jammy
|
||||
name: puppet-openstack-litmus-latest-ubuntu-noble
|
||||
parent: puppet-openstack-litmus-module-base
|
||||
nodeset: ubuntu-jammy
|
||||
nodeset: ubuntu-noble
|
||||
voting: false
|
||||
vars:
|
||||
puppet_gem_version: latest
|
||||
@ -82,27 +73,18 @@
|
||||
puppet_gem_version: 7.32
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-libraries-litmus-7.32-ubuntu-jammy
|
||||
name: puppet-openstack-libraries-litmus-8.10-ubuntu-noble
|
||||
parent: puppet-openstack-litmus-libraries-base
|
||||
nodeset: ubuntu-jammy
|
||||
nodeset: ubuntu-noble
|
||||
voting: false
|
||||
vars:
|
||||
puppet_gem_version: 7.32
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-libraries-litmus-8.10-centos-9-stream
|
||||
parent: puppet-openstack-litmus-libraries-base
|
||||
nodeset: centos-9-stream
|
||||
vars:
|
||||
puppet_gem_version: 8.10
|
||||
dnf_modules:
|
||||
ruby: 3.1
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-libraries-litmus-latest-ubuntu-jammy
|
||||
name: puppet-openstack-libraries-litmus-latest-ubuntu-noble
|
||||
parent: puppet-openstack-litmus-libraries-base
|
||||
voting: false
|
||||
nodeset: ubuntu-jammy
|
||||
nodeset: ubuntu-noble
|
||||
vars:
|
||||
puppet_gem_version: latest
|
||||
|
||||
@ -111,9 +93,8 @@
|
||||
check:
|
||||
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
|
||||
- puppet-openstack-litmus-8.10-ubuntu-noble
|
||||
- puppet-openstack-litmus-latest-ubuntu-noble
|
||||
gate:
|
||||
jobs:
|
||||
- puppet-openstack-litmus-7.32-centos-9-stream
|
||||
|
||||
@ -9,25 +9,16 @@
|
||||
puppet_gem_version: 7.32
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-unit-7.32-ubuntu-jammy
|
||||
name: puppet-openstack-unit-8.10-ubuntu-noble
|
||||
parent: puppet-openstack-unit-base
|
||||
nodeset: ubuntu-jammy
|
||||
vars:
|
||||
puppet_gem_version: 7.32
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-unit-8.10-centos-9-stream
|
||||
parent: puppet-openstack-unit-base
|
||||
nodeset: centos-9-stream
|
||||
nodeset: ubuntu-noble
|
||||
vars:
|
||||
puppet_gem_version: 8.10
|
||||
dnf_modules:
|
||||
ruby: 3.1
|
||||
|
||||
- job:
|
||||
name: puppet-openstack-unit-latest-ubuntu-jammy
|
||||
name: puppet-openstack-unit-latest-ubuntu-noble
|
||||
parent: puppet-openstack-unit-base
|
||||
nodeset: ubuntu-jammy
|
||||
nodeset: ubuntu-noble
|
||||
voting: false
|
||||
vars:
|
||||
puppet_gem_version: latest
|
||||
@ -37,11 +28,9 @@
|
||||
check:
|
||||
jobs:
|
||||
- puppet-openstack-unit-7.32-centos-9-stream
|
||||
- puppet-openstack-unit-7.32-ubuntu-jammy
|
||||
- puppet-openstack-unit-8.10-centos-9-stream
|
||||
- puppet-openstack-unit-latest-ubuntu-jammy
|
||||
- puppet-openstack-unit-8.10-ubuntu-noble
|
||||
- puppet-openstack-unit-latest-ubuntu-noble
|
||||
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
|
||||
- puppet-openstack-unit-8.10-ubuntu-noble
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user