From 237e8b07e046b1736f74f648e4c489644e4aad3c Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 12 Nov 2025 18:33:01 +0100 Subject: [PATCH] [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 --- ansible/inventory/group_vars/all/openstack | 6 +++--- etc/kayobe/openstack.yml | 4 ++-- requirements.yml | 2 +- tox.ini | 10 +++++----- zuul.d/jobs.yaml | 8 ++++++++ 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ansible/inventory/group_vars/all/openstack b/ansible/inventory/group_vars/all/openstack index e2525ac78..fe673cc33 100644 --- a/ansible/inventory/group_vars/all/openstack +++ b/ansible/inventory/group_vars/all/openstack @@ -2,10 +2,10 @@ ############################################################################### # OpenStack release configuration. -# Name of the current OpenStack release. Default is "master". -openstack_release: "master" +# Name of the current OpenStack release. Default is "2025.2". +openstack_release: "2025.2" -# Name of the current OpenStack branch. Default is "master". +# Name of the current OpenStack branch. Default is "stable/2025.2". openstack_branch: >- {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }} diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index 1acfd0756..d58a145fe 100644 --- a/etc/kayobe/openstack.yml +++ b/etc/kayobe/openstack.yml @@ -2,10 +2,10 @@ ############################################################################### # OpenStack release configuration. -# Name of the current OpenStack release. Default is "master". +# Name of the current OpenStack release. Default is "2025.2". #openstack_release: -# Name of the current OpenStack branch. Default is "master". +# Name of the current OpenStack branch. Default is "stable/2025.2". #openstack_branch: ############################################################################### diff --git a/requirements.yml b/requirements.yml index ef419f34d..ff8020124 100644 --- a/requirements.yml +++ b/requirements.yml @@ -2,7 +2,7 @@ collections: - name: https://opendev.org/openstack/ansible-collection-kolla type: git - version: master + version: stable/2025.2 - name: community.docker version: 3.11.0 - name: dellemc.os10 diff --git a/tox.ini b/tox.ini index 5801e7136..701bbcfd9 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ setenv = OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} @@ -26,7 +26,7 @@ commands = stestr run {posargs} [testenv:pep8] # sphinx8 needs the sphinx package which is required via doc/requirements.txt deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt -r{toxinidir}/test-requirements.txt @@ -41,7 +41,7 @@ commands = [testenv:venv] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt commands = {posargs} @@ -59,7 +59,7 @@ commands = [testenv:molecule] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2} -r{toxinidir}/requirements.txt -r{toxinidir}/molecule-requirements.txt commands = @@ -130,7 +130,7 @@ commands = [testenv:docs] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2} -r{toxinidir}/doc/requirements.txt commands = rm -rf doc/build/html diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 2d7272bab..a88ae8b60 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -71,11 +71,19 @@ required-projects: # Include kayobe to ensure other projects can use this job. - name: openstack/ansible-collection-kolla + # TODO(priteau): Remove when kayobe stable/2025.2 exists. + override-checkout: stable/2025.2 - name: openstack/kayobe - name: openstack/kayobe-config-dev - name: openstack/kolla + # TODO(priteau): Remove when kayobe stable/2025.2 exists. + override-checkout: stable/2025.2 - name: openstack/kolla-ansible + # TODO(priteau): Remove when kayobe stable/2025.2 exists. + override-checkout: stable/2025.2 - name: openstack/requirements + # TODO(priteau): Remove when kayobe stable/2025.2 exists. + override-checkout: stable/2025.2 - name: openstack/tenks irrelevant-files: - ^\..+