From 3e67ea6d2fbef75581a3dcc6fb97a79e536b75ae Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Thu, 16 Jun 2022 01:15:51 +0200
Subject: [PATCH] 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
---
ansible/roles/prechecks/vars/main.yml | 1 +
zuul.d/jobs.yaml | 36 +++++++++++++--------------
zuul.d/nodesets.yaml | 30 ++++++++++++++++------
3 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml
index e42a60473..28aef928d 100644
--- a/ansible/roles/prechecks/vars/main.yml
+++ b/ansible/roles/prechecks/vars/main.yml
@@ -21,3 +21,4 @@ host_os_distributions:
- "8"
Ubuntu:
- "focal"
+ - "jammy"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 53dc0f1da..60743b0c1 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -45,7 +45,7 @@
- job:
name: kolla-ansible-ubuntu-source
parent: kolla-ansible-base
- nodeset: kolla-ansible-focal
+ nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
tls_enabled: true
@@ -60,7 +60,7 @@
- job:
name: kolla-ansible-ubuntu-source-kvm
parent: kolla-ansible-kvm-base
- nodeset: kolla-ansible-focal-nested-virt
+ nodeset: kolla-ansible-jammy-nested-virt
vars:
base_distro: ubuntu
@@ -74,7 +74,7 @@
- job:
name: kolla-ansible-ubuntu-source-multinode-ipv6
parent: kolla-ansible-ipv6-base
- nodeset: kolla-ansible-focal-multi
+ nodeset: kolla-ansible-jammy-multi
vars:
base_distro: ubuntu
@@ -89,7 +89,7 @@
- job:
name: kolla-ansible-ubuntu-source-cephadm
parent: kolla-ansible-cephadm-base
- nodeset: kolla-ansible-focal-multi
+ nodeset: kolla-ansible-jammy-multi
timeout: 9000
vars:
base_distro: ubuntu
@@ -104,7 +104,7 @@
- job:
name: kolla-ansible-ubuntu-source-mariadb
parent: kolla-ansible-mariadb-base
- nodeset: kolla-ansible-focal-multi
+ nodeset: kolla-ansible-jammy-multi
vars:
base_distro: ubuntu
@@ -170,7 +170,7 @@
- job:
name: kolla-ansible-ubuntu-source-upgrade-cephadm
parent: kolla-ansible-cephadm-base
- nodeset: kolla-ansible-focal-multi
+ nodeset: kolla-ansible-jammy-multi
timeout: 9000
vars:
base_distro: ubuntu
@@ -187,7 +187,7 @@
- job:
name: kolla-ansible-ubuntu-source-bifrost
parent: kolla-ansible-bifrost-base
- nodeset: kolla-ansible-focal
+ nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
@@ -208,7 +208,7 @@
- job:
name: kolla-ansible-ubuntu-source-zun
parent: kolla-ansible-zun-base
- nodeset: kolla-ansible-focal-multi
+ nodeset: kolla-ansible-jammy-multi
vars:
base_distro: ubuntu
@@ -222,7 +222,7 @@
- job:
name: kolla-ansible-ubuntu-source-swift
parent: kolla-ansible-swift-base
- nodeset: kolla-ansible-focal-multi
+ nodeset: kolla-ansible-jammy-multi
vars:
base_distro: ubuntu
@@ -239,7 +239,7 @@
- job:
name: kolla-ansible-ubuntu-source-swift-upgrade
parent: kolla-ansible-swift-base
- nodeset: kolla-ansible-focal-multi
+ nodeset: kolla-ansible-jammy-multi
timeout: 10800
vars:
base_distro: ubuntu
@@ -270,7 +270,7 @@
- job:
name: kolla-ansible-ubuntu-source-ironic
parent: kolla-ansible-ironic-base
- nodeset: kolla-ansible-focal
+ nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
@@ -284,7 +284,7 @@
- job:
name: kolla-ansible-ubuntu-source-magnum
parent: kolla-ansible-magnum-base
- nodeset: kolla-ansible-focal
+ nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
@@ -298,14 +298,14 @@
- job:
name: kolla-ansible-ubuntu-source-octavia
parent: kolla-ansible-octavia-base
- nodeset: kolla-ansible-focal
+ nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
- job:
name: kolla-ansible-ubuntu-source-masakari
parent: kolla-ansible-masakari-base
- nodeset: kolla-ansible-focal-masakari
+ nodeset: kolla-ansible-jammy-masakari
vars:
base_distro: ubuntu
@@ -333,7 +333,7 @@
- job:
name: kolla-ansible-ubuntu-source-linuxbridge
parent: kolla-ansible-linuxbridge-base
- nodeset: kolla-ansible-focal
+ nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
@@ -354,7 +354,7 @@
- job:
name: kolla-ansible-ubuntu-source-ovn
parent: kolla-ansible-ovn-base
- nodeset: kolla-ansible-focal-multi
+ nodeset: kolla-ansible-jammy-multi
vars:
base_distro: ubuntu
@@ -368,7 +368,7 @@
- job:
name: kolla-ansible-ubuntu-source-prometheus-efk
parent: kolla-ansible-prometheus-efk-base
- nodeset: kolla-ansible-focal
+ nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
@@ -382,7 +382,7 @@
- job:
name: kolla-ansible-ubuntu-source-venus
parent: kolla-ansible-venus-base
- nodeset: kolla-ansible-focal
+ nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 36d087474..eeb53421e 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -23,6 +23,12 @@
- name: primary
label: ubuntu-focal
+- nodeset:
+ name: kolla-ansible-jammy
+ nodes:
+ - name: primary
+ label: ubuntu-jammy
+
- nodeset:
name: kolla-ansible-debian-bullseye-multi
nodes:
@@ -55,6 +61,16 @@
- name: secondary2
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:
name: kolla-ansible-centos8s-multi
nodes:
@@ -66,10 +82,10 @@
label: centos-8-stream
- nodeset:
- name: kolla-ansible-focal-nested-virt
+ name: kolla-ansible-jammy-nested-virt
nodes:
- name: primary
- label: nested-virt-ubuntu-focal
+ label: nested-virt-ubuntu-jammy
- nodeset:
name: kolla-ansible-centos8s-nested-virt
@@ -94,16 +110,16 @@
label: centos-8-stream
- nodeset:
- name: kolla-ansible-focal-masakari
+ name: kolla-ansible-jammy-masakari
nodes:
- name: primary
- label: ubuntu-focal
+ label: ubuntu-jammy
- name: secondary
- label: ubuntu-focal
+ label: ubuntu-jammy
- name: ternary1
- label: ubuntu-focal
+ label: ubuntu-jammy
- name: ternary2
- label: ubuntu-focal
+ label: ubuntu-jammy
- nodeset:
name: kolla-ansible-centos8s-masakari
--
GitLab