Merge "Use OpenStack Wallaby release"

This commit is contained in:
Zuul 2021-04-27 22:53:07 +00:00 committed by Gerrit Code Review
commit 174e3994df
4 changed files with 16 additions and 10 deletions

View File

@ -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 "wallaby".
openstack_release: "wallaby"
# Name of the current OpenStack branch. Default is "master".
# Name of the current OpenStack branch. Default is "stable/wallaby".
openstack_branch: >-
{% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}

View File

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

10
tox.ini
View File

@ -19,7 +19,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/wallaby}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run {posargs}
@ -27,7 +27,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/wallaby}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
-r{toxinidir}/test-requirements.txt
@ -42,7 +42,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/wallaby}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt
commands = {posargs}
@ -60,7 +60,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/wallaby}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals =
@ -109,7 +109,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/wallaby}
-r{toxinidir}/doc/requirements.txt
commands =
rm -rf doc/build/html

View File

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