openstack
/
kayobe
Code Issues Proposed changes

Use OpenStack Xena release 

Switch all dependencies to use the OpenStack Xena release.

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

Change-Id: Iee21230217ab1614977498dcbc2a18952ab7d64e
This commit is contained in:
Michal Nasiadka 2021-10-15 11:07:59 +02:00
parent e97a8fe63d
commit e0c42ea940
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.
# Name of the current OpenStack release. Default is "master".
openstack_release: "master"
# Name of the current OpenStack release. Default is "xena".
openstack_release: "xena"
# Name of the current OpenStack branch. Default is "master".
# Name of the current OpenStack branch. Default is "stable/xena".
openstack_branch: >-
{% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}

4
etc/kayobe/openstack.yml
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 "xena".
#openstack_release:
# Name of the current OpenStack branch. Default is "master".
# Name of the current OpenStack branch. Default is "stable/xena".
#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/xena}
-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/xena}
-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/xena}
-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/master}
#-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
-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/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
-r{toxinidir}/doc/requirements.txt
commands =
rm -rf doc/build/html

6
zuul.d/jobs.yaml
View File

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