Skip to content

Synchronise 2025.1 with upstream#184

Merged
mnasiadka merged 8 commits intostackhpc/2025.1from
upstream/2025.1-2026-04-20
Apr 24, 2026
Merged

Synchronise 2025.1 with upstream#184
mnasiadka merged 8 commits intostackhpc/2025.1from
upstream/2025.1-2026-04-20

Conversation

@github-actions
Copy link
Copy Markdown

This PR contains a snapshot of 2025.1 from upstream stable/2025.1.

OpenStack Proposal Bot and others added 8 commits April 2, 2026 15:23
meta: version: 10.9.1
meta: team: keystone
meta: diff-start: -
meta: series: epoxy
meta: branch: stable/2025.1
meta: release-type: release
meta: pypi: yes
meta: first: no
meta: release:Author: Dr. Jens Harbott <harbott@osism.tech>
meta: release:Commit: Dr. Jens Harbott <harbott@osism.tech>
meta: release:Change-Id: I1f8b08e23698eaede7b3502b76129ca0d79d19e0
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta: release:Code-Review+1: Pavlo Kostianov <pkostian@redhat.com>
meta: release:Code-Review+1: Artem Goncharov <artem.goncharov@gmail.com>
Change-Id: I0d9db451d3e5664e302fa5d859a821fa5692529c
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
meta: version: 25.3.2
meta: team: horizon
meta: diff-start: -
meta: series: epoxy
meta: branch: stable/2025.1
meta: release-type: release
meta: pypi: no
meta: first: no
meta: release:Author: Tatiana Ovchinnikova <t.v.ovtchinnikova@gmail.com>
meta: release:Commit: Tatiana Ovchinnikova <t.v.ovtchinnikova@gmail.com>
meta: release:Change-Id: Idfac95eef0ea7a286612c755dc6cc2de92077ee7
meta: release:Code-Review+2: Thierry Carrez <thierry@openstack.org>
meta: release:Workflow+1: Thierry Carrez <thierry@openstack.org>
meta: release:Code-Review+1: Ivan Anfimov <lazekteam@gmail.com>
Change-Id: I7a6f51705b6c63799f1d12a65c5bb3e582b67b09
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
In [0] two jobs were made non-voting in the check pipeline, but it was
missed to exclude them from gating.

[0] https://review.opendev.org/c/openstack/requirements/+/983159

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: I9649a84ea0ef1621b7c248df160f349df5d8099b
In general we do not allow to bump upper constraints (especially not
MAJOR versions), but the latest setuptools release (82.0.0) dropped
pkg_resources that causes issues when generating docs on stable/2025.1,
as the pinned pbr version still uses pkg_resurces, but pbr version
7.0.0 dropped hard dependency of pkg_resources module.
(This is only issue on stable/2025.1, as on newer branches pbr upper
constraint is >7.0.0.)

Furthermore, to fix the gate a couple of changes needed to be added:
- requirements-tox-pyXXX-check-uc jobs need pinned setuptools otherwise
  they fail with missing pkg_resources in xstatic-objectpath, hence
  this patch caps setuptools via virtualenv (which bundles setuptools)
  to all tox targets as a safe workaround

[1] I4cde27f048889dd557c0473138bd8a75c1e1cc58

Change-Id: I7420baa4585dc3f9a97574a5e521bfd5f6c8c7d8
Signed-off-by: Elod Illes <elod.illes@est.tech>
The ubuntu-bionic nodes are no longer available in the CI, so this job
has been deleted. Clean up the dangling references to avoid zuul config
errors.

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: I2e49dfff6bbc3d7de0681563cd7d93edbc48b167
(cherry picked from commit e7690d7)
@github-actions github-actions Bot requested a review from a team as a code owner April 20, 2026 07:03
@github-actions github-actions Bot added automated Automated action performed by GitHub Actions synchronisation labels Apr 20, 2026
@mnasiadka mnasiadka closed this Apr 24, 2026
@mnasiadka mnasiadka reopened this Apr 24, 2026
@mnasiadka mnasiadka merged commit d3ad6fd into stackhpc/2025.1 Apr 24, 2026
4 of 5 checks passed
@mnasiadka mnasiadka deleted the upstream/2025.1-2026-04-20 branch April 24, 2026 10:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automated Automated action performed by GitHub Actions synchronisation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants