From e95e543e6f877cfc304fcf678bc7201680d6c14d Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 2 Jul 2024 13:50:38 +0200 Subject: Use Bookworm for Debian upgrade jobs and update docs Remove Bullseye from support matrix Change-Id: If29ab064af9968784995115da6dd2cdf6e723c0b --- doc/source/user/support-matrix.rst | 7 ------- zuul.d/jobs.yaml | 6 +++--- zuul.d/nodesets.yaml | 12 ------------ 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/doc/source/user/support-matrix.rst b/doc/source/user/support-matrix.rst index 4af3f6b22..3ca14ac7e 100644 --- a/doc/source/user/support-matrix.rst +++ b/doc/source/user/support-matrix.rst @@ -7,12 +7,6 @@ Supported Operating Systems Kolla Ansible supports the following host Operating Systems (OS): -.. note:: - - CentOS Stream 8 is no longer supported as a host OS. The Yoga release - supports both CentOS Stream 8 and CentOS Stream 9 / Rocky Linux 9, and - provides a route for migration. - .. note:: CentOS Stream 9 is supported as a host OS while Kolla does not publish CS9 @@ -20,7 +14,6 @@ Kolla Ansible supports the following host Operating Systems (OS): Linux 9 images instead. * CentOS Stream 9 -* Debian Bullseye (11) * Debian Bookworm (12) * openEuler 22.03 LTS * Rocky Linux 9 diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 59d6f7952..b9ddb93f7 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -173,7 +173,7 @@ - job: name: kolla-ansible-debian-upgrade parent: kolla-ansible-base - nodeset: kolla-ansible-debian-bullseye + nodeset: kolla-ansible-debian-bookworm timeout: 10800 vars: base_distro: debian @@ -183,7 +183,7 @@ - job: name: kolla-ansible-debian-slurp-upgrade parent: kolla-ansible-base - nodeset: kolla-ansible-debian-bullseye + nodeset: kolla-ansible-debian-bookworm timeout: 9000 branches: master vars: @@ -196,7 +196,7 @@ - job: name: kolla-ansible-debian-upgrade-aarch64 parent: kolla-ansible-debian-upgrade - nodeset: kolla-ansible-debian-bullseye-aarch64 + nodeset: kolla-ansible-debian-bookworm-aarch64 - job: name: kolla-ansible-ubuntu-upgrade diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index d238b6cd7..e268979e9 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -5,24 +5,12 @@ - name: primary label: centos-9-stream -- nodeset: - name: kolla-ansible-debian-bullseye - nodes: - - name: primary - label: debian-bullseye - - nodeset: name: kolla-ansible-debian-bookworm nodes: - name: primary label: debian-bookworm -- nodeset: - name: kolla-ansible-debian-bullseye-aarch64 - nodes: - - name: primary - label: debian-bullseye-arm64 - - nodeset: name: kolla-ansible-debian-bookworm-aarch64 nodes: -- cgit v1.2.3