openstack
/
kayobe
Code Issues Proposed changes

Use OpenStack Train release 

Switch all dependencies to use the OpenStack Train release.

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

Change-Id: I6006e14df27a180f1438f9eb01b9ebefdddaff72
This commit is contained in:
Will Szumski 2019-04-12 15:40:02 +01:00 committed by Pierre Riteau
parent 9332c211f4
commit a93b85ba07
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 "train".
openstack_release: "train"
# Name of the current OpenStack branch. Default is "master".
# Name of the current OpenStack branch. Default is "stable/train".
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 "train".
#openstack_release:
# Name of the current OpenStack branch. Default is "master".
# Name of the current OpenStack branch. Default is "stable/train".
#openstack_branch:
###############################################################################

12
tox.ini
View File

@ -18,7 +18,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/train}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run {posargs}
@ -27,7 +27,7 @@ commands = stestr run {posargs}
basepython = python3
# 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/train}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
-r{toxinidir}/test-requirements.txt
@ -43,7 +43,7 @@ commands =
[testenv:venv]
basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt
commands = {posargs}
@ -66,7 +66,7 @@ commands =
# Molecule only supports python 2.7 and 3.6.
basepython = python2
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt
whitelist_externals =
@ -119,7 +119,7 @@ commands =
[testenv:docs]
basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands =
@ -142,7 +142,7 @@ commands = oslo_debug_helper {posargs}
[testenv:releasenotes]
basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands =

6
zuul.d/jobs.yaml
View File

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