From bc887cf89b099775d999e0a39c08cd525fbda0ce Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 16 Dec 2025 09:01:14 +0100 Subject: [PATCH 1/7] Document centos/rocky 10 support in 2025.1 Depends-On: https://review.opendev.org/c/openstack/kayobe/+/970263 Change-Id: I3477704578349a8febd69cd0c0909ba80637978e Signed-off-by: Pierre Riteau --- doc/source/support-matrix.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/source/support-matrix.rst b/doc/source/support-matrix.rst index fe973e3ef..a11503a91 100644 --- a/doc/source/support-matrix.rst +++ b/doc/source/support-matrix.rst @@ -19,14 +19,13 @@ therefore users need to build them by themselves. .. note:: CentOS Stream 9 is no longer supported as a host OS. The 2025.1 Epoxy - release will in future support both CentOS Stream 9 and 10 to provide a - route for migration. + release supports both CentOS Stream 9 and 10 to provide a route for + migration. .. note:: Rocky Linux 9 is no longer supported as a host OS. The 2025.1 Epoxy release - will in future support both CentOS Stream 9 and 10 to provide a route for - migration. + supports both CentOS Stream 9 and 10 to provide a route for migration. Supported container images ~~~~~~~~~~~~~~~~~~~~~~~~~~ From 6d62a9c9dd9813f22792b07cc9e162e5adc618da Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 7 Jan 2026 19:28:12 +0100 Subject: [PATCH 2/7] CI: Always use openstack-ci-mirrors element Version 3.40.1 of diskimage-builder includes the fix to the openstack-ci-mirrors element. Change-Id: I6dd6808f8ad5325314435650db47dc71e126d6d5 Signed-off-by: Pierre Riteau --- playbooks/kayobe-seed-base/overrides.yml.j2 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/playbooks/kayobe-seed-base/overrides.yml.j2 b/playbooks/kayobe-seed-base/overrides.yml.j2 index 9cfad25f8..b56fda355 100644 --- a/playbooks/kayobe-seed-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-base/overrides.yml.j2 @@ -46,9 +46,7 @@ ipa_build_images: {{ build_images }} ipa_build_dib_elements_extra: # extra-hardware is currently failing on Ubuntu - "{% raw %}{{ 'extra-hardware' if os_distribution != 'ubuntu' else '' }}{% endraw %}" - # Broken openstack-ci-mirrors for CentOS Stream 10. TODO(priteau): Remove - # conditional once https://review.opendev.org/965344 is released. - - "{% raw %}{{ 'openstack-ci-mirrors' if os_distribution != 'centos' else '' }}{% endraw %}" + - "openstack-ci-mirrors" # Workaround for limited tmpfs space in CI ipa_build_dib_env_extra: @@ -57,9 +55,7 @@ ipa_build_dib_env_extra: # Build overcloud host image. overcloud_dib_build_host_images: {{ build_images }} overcloud_dib_elements_extra: - # Broken openstack-ci-mirrors for CentOS Stream 10. TODO(priteau): Remove - # conditional once https://review.opendev.org/965344 is released. - - "{% raw %}{{ 'openstack-ci-mirrors' if os_distribution != 'centos' else '' }}{% endraw %}" + - "openstack-ci-mirrors" # NOTE(bbezak): Kolla does not build CentOS Stream 10 container images. # Using Rocky Linux 10 images on CentOS Stream 10 in CI. From 60a71c7adae37139fae4556fcac41963a5334fbd Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 20 Jan 2026 11:14:54 +0100 Subject: [PATCH 3/7] CI: Fix multiple issues The openstack-tox-py313 job runs on Debian Trixie, which does not have the libpcre3-dev package. Update bindep.txt to install it only for Ubuntu. This package is required for running pep8 and building docs. Disable seed jobs which are broken because of the addition of an OCI artifact registry in Bifrost. This is being resolved separately. Disable test of baremetal machine inspection: it is currently failing with power off timeout. Change-Id: I14519b2c511c06b409fe95ec57d42309081575f6 Signed-off-by: Pierre Riteau --- bindep.txt | 2 +- playbooks/kayobe-overcloud-base/run.yml | 2 +- zuul.d/project.yaml | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bindep.txt b/bindep.txt index e3d190257..74baf3904 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,4 +1,4 @@ -libpcre3-dev [platform:dpkg test] +libpcre3-dev [platform:ubuntu test] pcre-devel [platform:rpm test] # PDF Docs package dependencies diff --git a/playbooks/kayobe-overcloud-base/run.yml b/playbooks/kayobe-overcloud-base/run.yml index e5c617bc8..3fa4fdaee 100644 --- a/playbooks/kayobe-overcloud-base/run.yml +++ b/playbooks/kayobe-overcloud-base/run.yml @@ -42,7 +42,7 @@ chdir: "{{ kayobe_src_dir }}" executable: /bin/bash # TODO(priteau): Fix baremetal inspect issues with UEFI - when: ironic_boot_mode == 'bios' + when: ironic_boot_mode == 'bios' and false # TODO(priteau): Re-enable when working - name: Perform testing of the baremetal machines shell: diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index b9c1fc2f2..ae306505c 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -26,12 +26,12 @@ - kayobe-overcloud-ubuntu-noble-podman - kayobe-overcloud-upgrade-rocky10 - kayobe-overcloud-upgrade-ubuntu-noble - - kayobe-seed-rocky10 - - kayobe-seed-rocky10-podman - - kayobe-seed-ubuntu-noble - - kayobe-seed-ubuntu-noble-podman - - kayobe-seed-upgrade-rocky10 - - kayobe-seed-upgrade-ubuntu-noble + #- kayobe-seed-rocky10 + #- kayobe-seed-rocky10-podman + #- kayobe-seed-ubuntu-noble + #- kayobe-seed-ubuntu-noble-podman + #- kayobe-seed-upgrade-rocky10 + #- kayobe-seed-upgrade-ubuntu-noble - kayobe-seed-vm-rocky10 - kayobe-seed-vm-ubuntu-noble gate: @@ -53,12 +53,12 @@ - kayobe-overcloud-ubuntu-noble-podman - kayobe-overcloud-upgrade-rocky10 - kayobe-overcloud-upgrade-ubuntu-noble - - kayobe-seed-rocky10 - - kayobe-seed-rocky10-podman - - kayobe-seed-ubuntu-noble - - kayobe-seed-ubuntu-noble-podman - - kayobe-seed-upgrade-rocky10 - - kayobe-seed-upgrade-ubuntu-noble + #- kayobe-seed-rocky10 + #- kayobe-seed-rocky10-podman + #- kayobe-seed-ubuntu-noble + #- kayobe-seed-ubuntu-noble-podman + #- kayobe-seed-upgrade-rocky10 + #- kayobe-seed-upgrade-ubuntu-noble - kayobe-seed-vm-rocky10 - kayobe-seed-vm-ubuntu-noble From d7686f5f241244b199749428b3d0fb895238b64a Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 21 Jan 2026 10:08:32 +0100 Subject: [PATCH 4/7] CI: Re-enable seed jobs Bifrost added an OCI artifact registry [1] which runs as a Podman container. This currently does not work inside a Docker container, so it is disabled by the kolla-ansible bifrost role. [1] https://review.opendev.org/c/openstack/bifrost/+/961388 Closes-Bug: #2138705 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/974029 Change-Id: I3aa9f84bedbc5bc7b472e8aefa1c16499f40a153 Signed-off-by: Pierre Riteau --- zuul.d/project.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index ae306505c..b9c1fc2f2 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -26,12 +26,12 @@ - kayobe-overcloud-ubuntu-noble-podman - kayobe-overcloud-upgrade-rocky10 - kayobe-overcloud-upgrade-ubuntu-noble - #- kayobe-seed-rocky10 - #- kayobe-seed-rocky10-podman - #- kayobe-seed-ubuntu-noble - #- kayobe-seed-ubuntu-noble-podman - #- kayobe-seed-upgrade-rocky10 - #- kayobe-seed-upgrade-ubuntu-noble + - kayobe-seed-rocky10 + - kayobe-seed-rocky10-podman + - kayobe-seed-ubuntu-noble + - kayobe-seed-ubuntu-noble-podman + - kayobe-seed-upgrade-rocky10 + - kayobe-seed-upgrade-ubuntu-noble - kayobe-seed-vm-rocky10 - kayobe-seed-vm-ubuntu-noble gate: @@ -53,12 +53,12 @@ - kayobe-overcloud-ubuntu-noble-podman - kayobe-overcloud-upgrade-rocky10 - kayobe-overcloud-upgrade-ubuntu-noble - #- kayobe-seed-rocky10 - #- kayobe-seed-rocky10-podman - #- kayobe-seed-ubuntu-noble - #- kayobe-seed-ubuntu-noble-podman - #- kayobe-seed-upgrade-rocky10 - #- kayobe-seed-upgrade-ubuntu-noble + - kayobe-seed-rocky10 + - kayobe-seed-rocky10-podman + - kayobe-seed-ubuntu-noble + - kayobe-seed-ubuntu-noble-podman + - kayobe-seed-upgrade-rocky10 + - kayobe-seed-upgrade-ubuntu-noble - kayobe-seed-vm-rocky10 - kayobe-seed-vm-ubuntu-noble From c113917133d52dab516d95620eac797da0bfe5dd Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 22 Jan 2026 09:05:39 +0100 Subject: [PATCH 5/7] Add Python 3.13 classifier Python 3.13 is in the supported runtimes for 2026.1 Gazpacho [1] and is tested in CI. [1] https://governance.openstack.org/tc/reference/runtimes/2026.1.html Change-Id: I84aa1e162711459d844586bc35f12740665a767d Signed-off-by: Pierre Riteau --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 82526ed5b..7e493174f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,6 +19,7 @@ classifier = Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.12 + Programming Language :: Python :: 3.13 [files] packages = From b50cd2de65a0c6e922c8fa0976fca076d40530f0 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 22 Jan 2026 09:18:08 +0100 Subject: [PATCH 6/7] Replace obsolete PCRE packages pcre3 was removed from recent Debian-based releases (e.g. Trixie [1]), while RHEL10/CentOS Stream 10 no longer ships pcre in favor of pcre2. Use the latest whereto library release (0.5.0) which uses pcre2 instead. [1] https://lists.debian.org/debian-devel/2021/11/msg00176.html Co-Authored-By: Takashi Kajinami Depends-On: https://review.opendev.org/c/openstack/requirements/+/971428 Change-Id: I4ae0eed23a6bb479d35c1a097ebc967ed723fde5 Signed-off-by: Pierre Riteau --- bindep.txt | 5 +++-- doc/requirements.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bindep.txt b/bindep.txt index 74baf3904..d99bfd217 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,5 +1,6 @@ -libpcre3-dev [platform:ubuntu test] -pcre-devel [platform:rpm test] +# whereto dependencies +libpcre2-dev [platform:dpkg test] +pcre2-devel [platform:rpm test] # PDF Docs package dependencies tex-gyre [platform:dpkg doc] diff --git a/doc/requirements.txt b/doc/requirements.txt index 51a2c6498..604a1d205 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -6,4 +6,4 @@ openstackdocstheme>=2.2.1 # Apache-2.0 reno>=3.1.0 # Apache-2.0 sphinx>=2.0.0,!=2.1.0 # BSD sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD -whereto>=0.3.0 # Apache-2.0 +whereto>=0.5.0 # Apache-2.0 From aeaf7cb5f9be1116e23e19b52f5b50dda2795a7f Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 22 Jan 2026 09:56:39 +0100 Subject: [PATCH 7/7] CI: Set previous_release for 2026.1 Gazpacho Change-Id: I64c9960564ad1cf2dbf8ca5d1bc44bc95ce57cf2 Signed-off-by: Pierre Riteau --- zuul.d/jobs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 2af930cf3..b917e34fd 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -105,7 +105,7 @@ tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}" is_upgrade: "{{ 'upgrade' in zuul.job }}" is_slurp: "{{ 'slurp' in zuul.job }}" - previous_release: "{{ '2025.1' if is_slurp else '2025.1' }}" + previous_release: "{{ '2025.1' if is_slurp else '2025.2' }}" tls_enabled: false container_engine: 'docker' ironic_boot_mode: "bios"