openstack
/
kayobe
Code Issues Proposed changes

Use OpenStack 2023.1 release 

Switch all dependencies to use the OpenStack 2023.1 release.

This commit should be reverted on the master branch once the
Kayobe stable/2023.1 branch has been cut and RC1 released.

Change-Id: Id5e946fd7b0526faea99536f4a055f0f5c2b8176
This commit is contained in:
Matt Crees 2023-05-26 10:50:20 +01:00 committed by Michal Nasiadka
parent 0e984c4d47
commit 16a61da41a
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/inventory/group_vars/all/openstack
View File

@ -2,10 +2,10 @@
############################################################################### ###############################################################################
# OpenStack release configuration. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "master". # Name of the current OpenStack release. Default is "2023.1".
openstack_release: "master" openstack_release: "2023.1"
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/2023.1".
openstack_branch: >- openstack_branch: >-
{% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }} {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}

4
etc/kayobe/openstack.yml
View File

@ -2,10 +2,10 @@
############################################################################### ###############################################################################
# OpenStack release configuration. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "master". # Name of the current OpenStack release. Default is "2023.1".
#openstack_release: #openstack_release:
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/2023.1".
#openstack_branch: #openstack_branch:
############################################################################### ###############################################################################

2
requirements.yml
View File

@ -2,7 +2,7 @@
collections: collections:
- name: https://opendev.org/openstack/ansible-collection-kolla - name: https://opendev.org/openstack/ansible-collection-kolla
type: git type: git
version: master version: stable/2023.1
- name: dellemc.os10 - name: dellemc.os10
version: 1.1.1 version: 1.1.1

10
tox.ini
View File

@ -20,7 +20,7 @@ setenv =
OS_STDERR_CAPTURE=1 OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60 OS_TEST_TIMEOUT=60
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = stestr run {posargs} commands = stestr run {posargs}
@ -28,7 +28,7 @@ commands = stestr run {posargs}
[testenv:pep8] [testenv:pep8]
# sphinx8 needs the sphinx package which is required via doc/requirements.txt # sphinx8 needs the sphinx package which is required via doc/requirements.txt
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
@ -43,7 +43,7 @@ commands =
[testenv:venv] [testenv:venv]
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
@ -61,7 +61,7 @@ commands =
[testenv:molecule] [testenv:molecule]
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/molecule-requirements.txt -r{toxinidir}/molecule-requirements.txt
commands = commands =
@ -112,7 +112,7 @@ commands =
[testenv:docs] [testenv:docs]
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
rm -rf doc/build/html rm -rf doc/build/html

8
zuul.d/jobs.yaml
View File

@ -71,11 +71,19 @@
required-projects: required-projects:
# Include kayobe to ensure other projects can use this job. # Include kayobe to ensure other projects can use this job.
- name: openstack/ansible-collection-kolla - name: openstack/ansible-collection-kolla
# TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
override-checkout: stable/2023.1
- name: openstack/kayobe - name: openstack/kayobe
- name: openstack/kayobe-config-dev - name: openstack/kayobe-config-dev
- name: openstack/kolla - name: openstack/kolla
# TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
override-checkout: stable/2023.1
- name: openstack/kolla-ansible - name: openstack/kolla-ansible
# TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
override-checkout: stable/2023.1
- name: openstack/requirements - name: openstack/requirements
# TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
override-checkout: stable/2023.1
- name: openstack/tenks - name: openstack/tenks
irrelevant-files: irrelevant-files:
- ^\..+ - ^\..+