Skip to content

Commit 9eac849

Browse files
priteauAlex-Welsh
authored andcommitted
Revert "[release] Use OpenStack 2025.2 release"
This reverts commit 237e8b0. Reason for revert: 2025.2 has been branched and released Change-Id: I36e92d7f4eea44b7f0b1606e9f09a2e6fd6210f3 Signed-off-by: Pierre Riteau <[email protected]>
1 parent 29bd245 commit 9eac849

File tree

5 files changed

+11
-19
lines changed

5 files changed

+11
-19
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 "2025.2".
6-
openstack_release: "2025.2"
5+
# Name of the current OpenStack release. Default is "master".
6+
openstack_release: "master"
77

8-
# Name of the current OpenStack branch. Default is "stable/2025.2".
8+
# Name of the current OpenStack branch. Default is "master".
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 "2025.2".
5+
# Name of the current OpenStack release. Default is "master".
66
#openstack_release:
77

8-
# Name of the current OpenStack branch. Default is "stable/2025.2".
8+
# Name of the current OpenStack branch. Default is "master".
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: stable/2025.2
5+
version: master
66
- name: community.docker
77
version: 3.11.0
88
- name: community.network

tox.ini

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

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

4343
[testenv:venv]
4444
deps =
45-
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
45+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
4646
-r{toxinidir}/test-requirements.txt
4747
-r{toxinidir}/doc/requirements.txt
4848
commands = {posargs}
@@ -60,7 +60,7 @@ commands =
6060

6161
[testenv:molecule]
6262
deps =
63-
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
63+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
6464
-r{toxinidir}/requirements.txt
6565
-r{toxinidir}/molecule-requirements.txt
6666
commands =
@@ -131,7 +131,7 @@ commands =
131131

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

zuul.d/jobs.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,11 @@
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
7674
- name: openstack/kayobe
7775
- name: openstack/kayobe-config-dev
7876
- name: openstack/kolla
79-
# TODO(priteau): Remove when kayobe stable/2025.2 exists.
80-
override-checkout: stable/2025.2
8177
- name: openstack/kolla-ansible
82-
# TODO(priteau): Remove when kayobe stable/2025.2 exists.
83-
override-checkout: stable/2025.2
8478
- name: openstack/requirements
85-
# TODO(priteau): Remove when kayobe stable/2025.2 exists.
86-
override-checkout: stable/2025.2
8779
- name: openstack/tenks
8880
irrelevant-files:
8981
- ^\..+

0 commit comments

Comments
 (0)