Skip to content

Commit 237e8b0

Browse files
committed
[release] Use OpenStack 2025.2 release
Switch all dependencies to use the OpenStack 2025.2 release. This commit should be reverted on the master branch once the Kayobe stable/2025.2 branch has been cut and RC1 released. Depends-On: https://review.opendev.org/c/openstack/kayobe-config-dev/+/966901 Change-Id: I96f89ce707b950e266cee0625998286634d8baed Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
1 parent a846ccc commit 237e8b0

File tree

5 files changed

+19
-11
lines changed

5 files changed

+19
-11
lines changed

ansible/inventory/group_vars/all/openstack

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
###############################################################################
33
# OpenStack release configuration.
44

5-
# Name of the current OpenStack release. Default is "master".
6-
openstack_release: "master"
5+
# Name of the current OpenStack release. Default is "2025.2".
6+
openstack_release: "2025.2"
77

8-
# Name of the current OpenStack branch. Default is "master".
8+
# Name of the current OpenStack branch. Default is "stable/2025.2".
99
openstack_branch: >-
1010
{% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}
1111

etc/kayobe/openstack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
###############################################################################
33
# OpenStack release configuration.
44

5-
# Name of the current OpenStack release. Default is "master".
5+
# Name of the current OpenStack release. Default is "2025.2".
66
#openstack_release:
77

8-
# Name of the current OpenStack branch. Default is "master".
8+
# Name of the current OpenStack branch. Default is "stable/2025.2".
99
#openstack_branch:
1010

1111
###############################################################################

requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
collections:
33
- name: https://opendev.org/openstack/ansible-collection-kolla
44
type: git
5-
version: master
5+
version: stable/2025.2
66
- name: community.docker
77
version: 3.11.0
88
- name: dellemc.os10

tox.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ setenv =
1818
OS_STDERR_CAPTURE=1
1919
OS_TEST_TIMEOUT=60
2020
deps =
21-
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
21+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
2222
-r{toxinidir}/requirements.txt
2323
-r{toxinidir}/test-requirements.txt
2424
commands = stestr run {posargs}
2525

2626
[testenv:pep8]
2727
# sphinx8 needs the sphinx package which is required via doc/requirements.txt
2828
deps =
29-
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
29+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
3030
-r{toxinidir}/requirements.txt
3131
-r{toxinidir}/doc/requirements.txt
3232
-r{toxinidir}/test-requirements.txt
@@ -41,7 +41,7 @@ commands =
4141

4242
[testenv:venv]
4343
deps =
44-
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
44+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
4545
-r{toxinidir}/test-requirements.txt
4646
-r{toxinidir}/doc/requirements.txt
4747
commands = {posargs}
@@ -59,7 +59,7 @@ commands =
5959

6060
[testenv:molecule]
6161
deps =
62-
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
62+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
6363
-r{toxinidir}/requirements.txt
6464
-r{toxinidir}/molecule-requirements.txt
6565
commands =
@@ -130,7 +130,7 @@ commands =
130130

131131
[testenv:docs]
132132
deps =
133-
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
133+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
134134
-r{toxinidir}/doc/requirements.txt
135135
commands =
136136
rm -rf doc/build/html

zuul.d/jobs.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,19 @@
7171
required-projects:
7272
# Include kayobe to ensure other projects can use this job.
7373
- name: openstack/ansible-collection-kolla
74+
# TODO(priteau): Remove when kayobe stable/2025.2 exists.
75+
override-checkout: stable/2025.2
7476
- name: openstack/kayobe
7577
- name: openstack/kayobe-config-dev
7678
- name: openstack/kolla
79+
# TODO(priteau): Remove when kayobe stable/2025.2 exists.
80+
override-checkout: stable/2025.2
7781
- name: openstack/kolla-ansible
82+
# TODO(priteau): Remove when kayobe stable/2025.2 exists.
83+
override-checkout: stable/2025.2
7884
- name: openstack/requirements
85+
# TODO(priteau): Remove when kayobe stable/2025.2 exists.
86+
override-checkout: stable/2025.2
7987
- name: openstack/tenks
8088
irrelevant-files:
8189
- ^\..+

0 commit comments

Comments
 (0)