From afafebbe2be92648e056f06fab8bcfb67bb38236 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 13 Mar 2025 12:17:23 +0100 Subject: [PATCH] Remove remaining mentions of Ubuntu Jammy Change-Id: I1c93dac521cacaddb5195688c17c1f74d05e5f9a --- ansible/inventory/group_vars/all/globals | 4 ++-- doc/source/installation.rst | 1 - doc/source/support-matrix.rst | 1 - zuul.d/jobs.yaml | 2 -- zuul.d/nodesets.yaml | 6 ------ 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ansible/inventory/group_vars/all/globals b/ansible/inventory/group_vars/all/globals index 3df1218df..795ad98b1 100644 --- a/ansible/inventory/group_vars/all/globals +++ b/ansible/inventory/group_vars/all/globals @@ -53,8 +53,8 @@ kayobe_ansible_user: "stack" os_distribution: "rocky" # OS release. Valid options are "9-stream" when os_distribution is "centos", or -# "9" when os_distribution is "rocky", or "jammy" and "noble" (with "noble" -# being the default) when os_distribution is "ubuntu". +# "9" when os_distribution is "rocky", or "noble" when os_distribution is +# "ubuntu". os_release: >- {{ '9-stream' if os_distribution == 'centos' else '9' if os_distribution == 'rocky' diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 053bff63e..01fd80f2f 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -17,7 +17,6 @@ control host: - CentOS Stream 9 (since Zed 13.0.0 release) - Rocky Linux 9 (since Zed 13.0.0 release) -- Ubuntu Jammy 22.04 (since Zed 13.0.0 release) - Ubuntu Noble 24.04 (since Dalmatian 17.0.0 release) See the :doc:`support matrix ` for details of supported diff --git a/doc/source/support-matrix.rst b/doc/source/support-matrix.rst index f3ad926ef..e52fa111c 100644 --- a/doc/source/support-matrix.rst +++ b/doc/source/support-matrix.rst @@ -10,7 +10,6 @@ Supported Operating Systems Kayobe supports the following host Operating Systems (OS): * Rocky Linux 9 (since Zed 13.0.0 release) -* Ubuntu Jammy 22.04 (since Zed 13.0.0 release) * Ubuntu Noble 24.04 (since Dalmatian 17.0.0 release) In addition to that CentOS Stream 9 host OS is functional, but not officially diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 57bbe0fcc..07654a8d4 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -270,8 +270,6 @@ overcloud_container_image_regex: "^base" seed_container_image_regex: "^base" -# This job builds default overcloud images but skips the build of bifrost seed -# images which are currently timing out on Ubuntu Jammy. - job: name: kayobe-seed-images-rocky9-podman parent: kayobe-seed-images-base diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index c47febe3a..3dd99d404 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -11,12 +11,6 @@ - name: primary label: rockylinux-9 -- nodeset: - name: kayobe-ubuntu-jammy - nodes: - - name: primary - label: ubuntu-jammy - - nodeset: name: kayobe-ubuntu-noble nodes: