openstack/kayobe
Code Issues Proposed changes

Use OpenStack Zed release

Browse Source 
Switch all dependencies to use the OpenStack Zed release.

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

Change-Id: I1ea18a68bb2c1ea6a2a45f6cbd3c48fd30bb1c8a
This commit is contained in:
Bartosz Bezak 2022-12-14 10:47:24 +01:00 committed by Michal Nasiadka
parent 9ac1c95f1d
commit 65c59b9f59
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 "zed".
openstack_release: "master" openstack_release: "zed"
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/zed".
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 "zed".
#openstack_release: #openstack_release:
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/zed".
#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/zed
- name: dellemc.os10 - name: dellemc.os10
version: 1.1.1 version: 1.1.1

10
tox.ini
View File

@ -19,7 +19,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/zed}
-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}
@ -27,7 +27,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/zed}
-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
@ -42,7 +42,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/zed}
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
@ -60,7 +60,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/zed}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/molecule-requirements.txt -r{toxinidir}/molecule-requirements.txt
whitelist_externals = whitelist_externals =
@ -109,7 +109,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/zed}
-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

@ -66,11 +66,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(bbezak): Remove when kayobe stable/zed exists.
override-checkout: stable/zed
- name: openstack/kayobe - name: openstack/kayobe
- name: openstack/kayobe-config-dev - name: openstack/kayobe-config-dev
- name: openstack/kolla - name: openstack/kolla
# TODO(bbezak): Remove when kayobe stable/zed exists.
override-checkout: stable/zed
- name: openstack/kolla-ansible - name: openstack/kolla-ansible
# TODO(bbezak): Remove when kayobe stable/zed exists.
override-checkout: stable/zed
- name: openstack/requirements - name: openstack/requirements
# TODO(bbezak): Remove when kayobe stable/zed exists.
override-checkout: stable/zed
- name: openstack/tenks - name: openstack/tenks
irrelevant-files: irrelevant-files:
- ^\..+ - ^\..+