openstack/kayobe
Code Issues Proposed changes

Use OpenStack Wallaby release

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

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

Change-Id: I977943e81a79e4a40cca04d80d786ca49afd3d39
This commit is contained in:
Michał Nasiadka 2021-04-26 09:04:04 +02:00 committed by Michal Nasiadka
parent 7411e624de
commit 3f76d7d134
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/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 "wallaby".
openstack_release: "master" openstack_release: "wallaby"
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/wallaby".
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 "wallaby".
#openstack_release: #openstack_release:
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/wallaby".
#openstack_branch: #openstack_branch:
############################################################################### ###############################################################################

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/wallaby}
-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/wallaby}
-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/wallaby}
-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/wallaby}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-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/wallaby}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
rm -rf doc/build/html rm -rf doc/build/html

6
zuul.d/jobs.yaml
View File

@ -59,8 +59,14 @@
- name: openstack/kayobe - name: openstack/kayobe
- name: openstack/kayobe-config-dev - name: openstack/kayobe-config-dev
- name: openstack/kolla - name: openstack/kolla
# TODO(mnasiadka): Remove when kayobe stable/wallaby exists.
override-checkout: stable/wallaby
- name: openstack/kolla-ansible - name: openstack/kolla-ansible
# TODO(mnasiadka): Remove when kayobe stable/wallaby exists.
override-checkout: stable/wallaby
- name: openstack/requirements - name: openstack/requirements
# TODO(mnasiadka): Remove when kayobe stable/wallaby exists.
override-checkout: stable/wallaby
- name: openstack/tenks - name: openstack/tenks
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$