From d634ec9479387899fac454e2f05b53bcb94e5ce9 Mon Sep 17 00:00:00 2001
From: Maksim Malchuk <maksim.malchuk@gmail.com>
Date: Wed, 19 Jun 2024 16:32:53 +0300
Subject: [PATCH] Revert "[release] Use OpenStack 2024.1 release"
This reverts commit b4448d6b156cd53688286c229a834be5107894f8.
Change-Id: I76aa0fcf362b77fe22f738b9d1c60cbc363531a4
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
---
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, 11 insertions(+), 19 deletions(-)
diff --git a/ansible/inventory/group_vars/all/openstack b/ansible/inventory/group_vars/all/openstack
index 4e8c4b74..86bf653e 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 "2024.1".
-openstack_release: "2024.1"
+# Name of the current OpenStack release. Default is "master".
+openstack_release: "master"
-# Name of the current OpenStack branch. Default is "stable/2024.1".
+# Name of the current OpenStack branch. Default is "master".
openstack_branch: >-
{% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}
diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml
index 4db759fc..1acfd075 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 "2024.1".
+# Name of the current OpenStack release. Default is "master".
#openstack_release:
-# Name of the current OpenStack branch. Default is "stable/2024.1".
+# Name of the current OpenStack branch. Default is "master".
#openstack_branch:
###############################################################################
diff --git a/requirements.yml b/requirements.yml
index 1221b56d..bfb834d4 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -2,7 +2,7 @@
collections:
- name: https://opendev.org/openstack/ansible-collection-kolla
type: git
- version: stable/2024.1
+ version: master
- name: dellemc.os10
version: 1.1.1
- name: openstack.cloud
diff --git a/tox.ini b/tox.ini
index e93551bb..7eba3afd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,7 @@ setenv =
OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60
deps =
- -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run {posargs}
@@ -28,7 +28,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/2024.1}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
-r{toxinidir}/test-requirements.txt
@@ -43,7 +43,7 @@ commands =
[testenv:venv]
deps =
- -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt
commands = {posargs}
@@ -61,7 +61,7 @@ commands =
[testenv:molecule]
deps =
- -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/molecule-requirements.txt
commands =
@@ -112,7 +112,7 @@ commands =
[testenv:docs]
deps =
- -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands =
rm -rf doc/build/html
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 8d9b81e0..d6b3b6c6 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -71,19 +71,11 @@
required-projects:
# Include kayobe to ensure other projects can use this job.
- name: openstack/ansible-collection-kolla
- # TODO(priteau): Remove when kayobe stable/2024.1 exists.
- override-checkout: stable/2024.1
- name: openstack/kayobe
- name: openstack/kayobe-config-dev
- name: openstack/kolla
- # TODO(priteau): Remove when kayobe stable/2024.1 exists.
- override-checkout: stable/2024.1
- name: openstack/kolla-ansible
- # TODO(priteau): Remove when kayobe stable/2024.1 exists.
- override-checkout: stable/2024.1
- name: openstack/requirements
- # TODO(priteau): Remove when kayobe stable/2024.1 exists.
- override-checkout: stable/2024.1
- name: openstack/tenks
irrelevant-files:
- ^\..+
--
GitLab