Revert "[release] Use OpenStack Yoga release"

This reverts commit 88dd02dc92.

Reason for revert: Master is now Zed

Change-Id: I9a18c41dbdc369a7a719632d6e41e2373784f29e
This commit is contained in:
Mark Goddard 2022-04-14 08:09:18 +00:00
parent 88dd02dc92
commit 07f8e41bbb
5 changed files with 11 additions and 19 deletions

View File

@ -2,10 +2,10 @@
###############################################################################
# OpenStack release configuration.
# Name of the current OpenStack release. Default is "yoga".
openstack_release: "yoga"
# Name of the current OpenStack release. Default is "master".
openstack_release: "master"
# Name of the current OpenStack branch. Default is "stable/yoga".
# Name of the current OpenStack branch. Default is "master".
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 "yoga".
# Name of the current OpenStack release. Default is "master".
#openstack_release:
# Name of the current OpenStack branch. Default is "stable/yoga".
# Name of the current OpenStack branch. Default is "master".
#openstack_branch:
###############################################################################

View File

@ -2,7 +2,7 @@
collections:
- name: https://opendev.org/openstack/ansible-collection-kolla
type: git
version: stable/yoga
version: master
roles:
- src: ahuffman.resolv
version: 1.3.1

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/yoga}
-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}
@ -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/yoga}
-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
@ -42,7 +42,7 @@ commands =
[testenv:venv]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt
commands = {posargs}
@ -62,7 +62,7 @@ commands =
deps =
# TODO(priteau): Restore upper constraints once molecule dependency
# resolution is working
#-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
#-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/molecule-requirements.txt
whitelist_externals =
@ -111,7 +111,7 @@ commands =
[testenv:docs]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands =
rm -rf doc/build/html

View File

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