diff --git a/bindep.txt b/bindep.txt index e3d190257..d99bfd217 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,5 +1,6 @@ -libpcre3-dev [platform:dpkg 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 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 ~~~~~~~~~~~~~~~~~~~~~~~~~~ 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/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. 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 = 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"