Skip to content

Synchronise master with upstream #519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
priteau merged 12 commits into from
Jan 26, 2026
Merged

Synchronise master with upstream #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bc887cf
Document centos/rocky 10 support in 2025.1
priteau Dec 16, 2025
6d62a9c
CI: Always use openstack-ci-mirrors element
priteau Jan 7, 2026
60a71c7
CI: Fix multiple issues
priteau Jan 20, 2026
d7686f5
CI: Re-enable seed jobs
priteau Jan 21, 2026
c113917
Add Python 3.13 classifier
priteau Jan 22, 2026
b50cd2d
Replace obsolete PCRE packages
priteau Jan 22, 2026
aeaf7cb
CI: Set previous_release for 2026.1 Gazpacho
priteau Jan 22, 2026
4793070
Merge "Document centos/rocky 10 support in 2025.1"
Jan 22, 2026
7d72125
Merge "CI: Always use openstack-ci-mirrors element"
Jan 22, 2026
eb81583
Merge "Add Python 3.13 classifier"
Jan 22, 2026
0f00bba
Merge "Replace obsolete PCRE packages"
Jan 22, 2026
7ad8640
Merge "CI: Set previous_release for 2026.1 Gazpacho"
Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions bindep.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
2 changes: 1 addition & 1 deletion doc/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions doc/source/support-matrix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion playbooks/kayobe-overcloud-base/run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 2 additions & 6 deletions playbooks/kayobe-seed-base/overrides.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion zuul.d/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down