aboutsummaryrefslogtreecommitdiff
path: root/zuul.d
diff options
context:
space:
mode:
authorBartosz Bezak <bartosz@stackhpc.com>2023-01-26 14:25:45 +0100
committerBartosz Bezak <bartosz@stackhpc.com>2023-01-29 14:28:51 +0000
commit6db6bc0a9f62aa97922aaf6c9d12078d180e2d8a (patch)
tree9bae3228c81fd955dca23b5ae0f08c5dade0b051 /zuul.d
parent38ccebb8cb01cec3e6336fe1d2bd1f5a6dd5b224 (diff)
downloadkolla-ansible-6db6bc0a9f62aa97922aaf6c9d12078d180e2d8a.tar.gz
kolla-ansible-6db6bc0a9f62aa97922aaf6c9d12078d180e2d8a.zip
Remove support for Ubuntu Focal 20.04 hosts
Users running on a Focal host will now fail in prechecks. Change-Id: Icaef4b25458490e46f623b055658abc678d2f1c6
Diffstat (limited to 'zuul.d')
-rw-r--r--zuul.d/jobs.yaml21
-rw-r--r--zuul.d/nodesets.yaml16
2 files changed, 6 insertions, 31 deletions
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ba5adfa13..a297a3c9d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -127,19 +127,9 @@
nodeset: kolla-ansible-debian-bullseye-aarch64
- job:
- name: kolla-ansible-ubuntu-binary-upgrade
- parent: kolla-ansible-base
- nodeset: kolla-ansible-focal
- timeout: 9000
- vars:
- base_distro: ubuntu
- is_upgrade: yes
- tls_enabled: true
-
-- job:
name: kolla-ansible-ubuntu-upgrade
parent: kolla-ansible-base
- nodeset: kolla-ansible-focal
+ nodeset: kolla-ansible-jammy
timeout: 9000
vars:
base_distro: ubuntu
@@ -149,16 +139,17 @@
- job:
name: kolla-ansible-ubuntu-upgrade-cephadm
parent: kolla-ansible-cephadm-base
- nodeset: kolla-ansible-focal-multi
+ nodeset: kolla-ansible-jammy-multi
timeout: 9000
vars:
base_distro: ubuntu
is_upgrade: yes
+ cephadm_use_package_from_distribution: true
- job:
name: kolla-ansible-ubuntu-upgrade-ovn
parent: kolla-ansible-ovn-base
- nodeset: kolla-ansible-focal-multi
+ nodeset: kolla-ansible-jammy-multi
timeout: 9000
vars:
base_distro: ubuntu
@@ -222,7 +213,7 @@
- job:
name: kolla-ansible-ubuntu-swift-upgrade
parent: kolla-ansible-swift-base
- nodeset: kolla-ansible-focal-multi
+ nodeset: kolla-ansible-jammy-multi
timeout: 10800
vars:
base_distro: ubuntu
@@ -343,7 +334,7 @@
- job:
name: kolla-ansible-ubuntu-prometheus-opensearch-upgrade
parent: kolla-ansible-prometheus-opensearch-base
- nodeset: kolla-ansible-focal
+ nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
is_upgrade: yes
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 0fa0fa0b9..be8630d5e 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -18,12 +18,6 @@
label: debian-bullseye-arm64
- nodeset:
- name: kolla-ansible-focal
- nodes:
- - name: primary
- label: ubuntu-focal
-
-- nodeset:
name: kolla-ansible-jammy
nodes:
- name: primary
@@ -52,16 +46,6 @@
label: rockylinux-9
- nodeset:
- name: kolla-ansible-focal-multi
- nodes:
- - name: primary
- label: ubuntu-focal
- - name: secondary1
- label: ubuntu-focal
- - name: secondary2
- label: ubuntu-focal
-
-- nodeset:
name: kolla-ansible-jammy-multi
nodes:
- name: primary