diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml
index e42a60473d8dc2f0b299e7d02b7022dcfdda9e5a..28aef928d359a21cb9a46d500856b2d3281e730c 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 229d297e90e649cac20cebf253d0ae1533ff06ad..25ec2d9b5af9b9ca86bc5a0fa7e02325fda43f5c 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
@@ -207,7 +207,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
@@ -228,7 +228,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
@@ -242,7 +242,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
@@ -259,7 +259,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
@@ -290,7 +290,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
@@ -304,7 +304,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
@@ -318,14 +318,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
@@ -353,7 +353,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
@@ -374,7 +374,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
@@ -388,7 +388,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
@@ -402,7 +402,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 36d087474d88f4e0fa62f64c589872cda62ddaad..eeb53421e64304205aa1fb2b9bedde3ac4308d8d 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