openstack
/
kayobe
Code Issues Proposed changes

Use OpenStack Ussuri release 

Switch all dependencies to use the OpenStack Ussuri release.

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

Change-Id: Id126ea109e6dfcba09b524129876985547ad368f
This commit is contained in:
Mark Goddard 2020-05-29 15:42:07 +01:00
parent f2c2114370
commit ffce6fa641
4 changed files with 17 additions and 11 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 "ussuri".
openstack_release: "ussuri"
# Name of the current OpenStack branch. Default is "master".
# Name of the current OpenStack branch. Default is "stable/ussuri".
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 "ussuri".
#openstack_release:
# Name of the current OpenStack branch. Default is "master".
# Name of the current OpenStack branch. Default is "stable/ussuri".
#openstack_branch:
###############################################################################

12
tox.ini
View File

@ -19,7 +19,7 @@ setenv =
OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-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:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
-r{toxinidir}/test-requirements.txt
@ -42,7 +42,7 @@ commands =
[testenv:venv]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt
commands = {posargs}
@ -60,7 +60,7 @@ commands =
[testenv:molecule]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt
whitelist_externals =
@ -109,7 +109,7 @@ commands =
[testenv:docs]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands =
@ -129,7 +129,7 @@ commands = oslo_debug_helper {posargs}
[testenv:releasenotes]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands =

6
zuul.d/jobs.yaml
View File

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