Skip to content
Snippets Groups Projects
Commit 3e67ea6d authored by Dr. Jens Harbott's avatar Dr. Jens Harbott Committed by Michal Nasiadka
Browse files

Add support for Ubuntu Jammy Jellyfish (22.04 LTS)

* Add jammy to allowed Ubuntu distros in precheck

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/847187
Depends-On: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/850336
Change-Id: Ib68adc2e33bf211d9cec007a1edb9590cafaefd1
parent 92f8e93b
No related branches found
No related tags found
No related merge requests found
...@@ -21,3 +21,4 @@ host_os_distributions: ...@@ -21,3 +21,4 @@ host_os_distributions:
- "8" - "8"
Ubuntu: Ubuntu:
- "focal" - "focal"
- "jammy"
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source name: kolla-ansible-ubuntu-source
parent: kolla-ansible-base parent: kolla-ansible-base
nodeset: kolla-ansible-focal nodeset: kolla-ansible-jammy
vars: vars:
base_distro: ubuntu base_distro: ubuntu
tls_enabled: true tls_enabled: true
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-kvm name: kolla-ansible-ubuntu-source-kvm
parent: kolla-ansible-kvm-base parent: kolla-ansible-kvm-base
nodeset: kolla-ansible-focal-nested-virt nodeset: kolla-ansible-jammy-nested-virt
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-multinode-ipv6 name: kolla-ansible-ubuntu-source-multinode-ipv6
parent: kolla-ansible-ipv6-base parent: kolla-ansible-ipv6-base
nodeset: kolla-ansible-focal-multi nodeset: kolla-ansible-jammy-multi
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-cephadm name: kolla-ansible-ubuntu-source-cephadm
parent: kolla-ansible-cephadm-base parent: kolla-ansible-cephadm-base
nodeset: kolla-ansible-focal-multi nodeset: kolla-ansible-jammy-multi
timeout: 9000 timeout: 9000
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-mariadb name: kolla-ansible-ubuntu-source-mariadb
parent: kolla-ansible-mariadb-base parent: kolla-ansible-mariadb-base
nodeset: kolla-ansible-focal-multi nodeset: kolla-ansible-jammy-multi
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-upgrade-cephadm name: kolla-ansible-ubuntu-source-upgrade-cephadm
parent: kolla-ansible-cephadm-base parent: kolla-ansible-cephadm-base
nodeset: kolla-ansible-focal-multi nodeset: kolla-ansible-jammy-multi
timeout: 9000 timeout: 9000
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-bifrost name: kolla-ansible-ubuntu-source-bifrost
parent: kolla-ansible-bifrost-base parent: kolla-ansible-bifrost-base
nodeset: kolla-ansible-focal nodeset: kolla-ansible-jammy
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-zun name: kolla-ansible-ubuntu-source-zun
parent: kolla-ansible-zun-base parent: kolla-ansible-zun-base
nodeset: kolla-ansible-focal-multi nodeset: kolla-ansible-jammy-multi
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-swift name: kolla-ansible-ubuntu-source-swift
parent: kolla-ansible-swift-base parent: kolla-ansible-swift-base
nodeset: kolla-ansible-focal-multi nodeset: kolla-ansible-jammy-multi
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-swift-upgrade name: kolla-ansible-ubuntu-source-swift-upgrade
parent: kolla-ansible-swift-base parent: kolla-ansible-swift-base
nodeset: kolla-ansible-focal-multi nodeset: kolla-ansible-jammy-multi
timeout: 10800 timeout: 10800
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-ironic name: kolla-ansible-ubuntu-source-ironic
parent: kolla-ansible-ironic-base parent: kolla-ansible-ironic-base
nodeset: kolla-ansible-focal nodeset: kolla-ansible-jammy
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-magnum name: kolla-ansible-ubuntu-source-magnum
parent: kolla-ansible-magnum-base parent: kolla-ansible-magnum-base
nodeset: kolla-ansible-focal nodeset: kolla-ansible-jammy
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -298,14 +298,14 @@ ...@@ -298,14 +298,14 @@
- job: - job:
name: kolla-ansible-ubuntu-source-octavia name: kolla-ansible-ubuntu-source-octavia
parent: kolla-ansible-octavia-base parent: kolla-ansible-octavia-base
nodeset: kolla-ansible-focal nodeset: kolla-ansible-jammy
vars: vars:
base_distro: ubuntu base_distro: ubuntu
- job: - job:
name: kolla-ansible-ubuntu-source-masakari name: kolla-ansible-ubuntu-source-masakari
parent: kolla-ansible-masakari-base parent: kolla-ansible-masakari-base
nodeset: kolla-ansible-focal-masakari nodeset: kolla-ansible-jammy-masakari
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -333,7 +333,7 @@ ...@@ -333,7 +333,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-linuxbridge name: kolla-ansible-ubuntu-source-linuxbridge
parent: kolla-ansible-linuxbridge-base parent: kolla-ansible-linuxbridge-base
nodeset: kolla-ansible-focal nodeset: kolla-ansible-jammy
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-ovn name: kolla-ansible-ubuntu-source-ovn
parent: kolla-ansible-ovn-base parent: kolla-ansible-ovn-base
nodeset: kolla-ansible-focal-multi nodeset: kolla-ansible-jammy-multi
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-prometheus-efk name: kolla-ansible-ubuntu-source-prometheus-efk
parent: kolla-ansible-prometheus-efk-base parent: kolla-ansible-prometheus-efk-base
nodeset: kolla-ansible-focal nodeset: kolla-ansible-jammy
vars: vars:
base_distro: ubuntu base_distro: ubuntu
...@@ -382,7 +382,7 @@ ...@@ -382,7 +382,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-venus name: kolla-ansible-ubuntu-source-venus
parent: kolla-ansible-venus-base parent: kolla-ansible-venus-base
nodeset: kolla-ansible-focal nodeset: kolla-ansible-jammy
vars: vars:
base_distro: ubuntu base_distro: ubuntu
......
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
- name: primary - name: primary
label: ubuntu-focal label: ubuntu-focal
- nodeset:
name: kolla-ansible-jammy
nodes:
- name: primary
label: ubuntu-jammy
- nodeset: - nodeset:
name: kolla-ansible-debian-bullseye-multi name: kolla-ansible-debian-bullseye-multi
nodes: nodes:
...@@ -55,6 +61,16 @@ ...@@ -55,6 +61,16 @@
- name: secondary2 - name: secondary2
label: ubuntu-focal label: ubuntu-focal
- nodeset:
name: kolla-ansible-jammy-multi
nodes:
- name: primary
label: ubuntu-jammy
- name: secondary1
label: ubuntu-jammy
- name: secondary2
label: ubuntu-jammy
- nodeset: - nodeset:
name: kolla-ansible-centos8s-multi name: kolla-ansible-centos8s-multi
nodes: nodes:
...@@ -66,10 +82,10 @@ ...@@ -66,10 +82,10 @@
label: centos-8-stream label: centos-8-stream
- nodeset: - nodeset:
name: kolla-ansible-focal-nested-virt name: kolla-ansible-jammy-nested-virt
nodes: nodes:
- name: primary - name: primary
label: nested-virt-ubuntu-focal label: nested-virt-ubuntu-jammy
- nodeset: - nodeset:
name: kolla-ansible-centos8s-nested-virt name: kolla-ansible-centos8s-nested-virt
...@@ -94,16 +110,16 @@ ...@@ -94,16 +110,16 @@
label: centos-8-stream label: centos-8-stream
- nodeset: - nodeset:
name: kolla-ansible-focal-masakari name: kolla-ansible-jammy-masakari
nodes: nodes:
- name: primary - name: primary
label: ubuntu-focal label: ubuntu-jammy
- name: secondary - name: secondary
label: ubuntu-focal label: ubuntu-jammy
- name: ternary1 - name: ternary1
label: ubuntu-focal label: ubuntu-jammy
- name: ternary2 - name: ternary2
label: ubuntu-focal label: ubuntu-jammy
- nodeset: - nodeset:
name: kolla-ansible-centos8s-masakari name: kolla-ansible-centos8s-masakari
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment