Skip to content
Snippets Groups Projects
Commit a93b85ba authored by Will Szumski's avatar Will Szumski Committed by Pierre Riteau
Browse files

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
parent 9332c211
No related branches found
No related tags found
No related merge requests found
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
############################################################################### ###############################################################################
# OpenStack release configuration. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "master". # Name of the current OpenStack release. Default is "train".
openstack_release: "master" openstack_release: "train"
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/train".
openstack_branch: >- openstack_branch: >-
{% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }} {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
############################################################################### ###############################################################################
# OpenStack release configuration. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "master". # Name of the current OpenStack release. Default is "train".
#openstack_release: #openstack_release:
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/train".
#openstack_branch: #openstack_branch:
############################################################################### ###############################################################################
......
...@@ -18,7 +18,7 @@ setenv = ...@@ -18,7 +18,7 @@ setenv =
OS_STDERR_CAPTURE=1 OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60 OS_TEST_TIMEOUT=60
deps = 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}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = stestr run {posargs} commands = stestr run {posargs}
...@@ -27,7 +27,7 @@ commands = stestr run {posargs} ...@@ -27,7 +27,7 @@ commands = stestr run {posargs}
basepython = python3 basepython = python3
# sphinx8 needs the sphinx package which is required via doc/requirements.txt # sphinx8 needs the sphinx package which is required via doc/requirements.txt
deps = 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}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
...@@ -43,7 +43,7 @@ commands = ...@@ -43,7 +43,7 @@ commands =
[testenv:venv] [testenv:venv]
basepython = python3 basepython = python3
deps = 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}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
...@@ -66,7 +66,7 @@ commands = ...@@ -66,7 +66,7 @@ commands =
# Molecule only supports python 2.7 and 3.6. # Molecule only supports python 2.7 and 3.6.
basepython = python2 basepython = python2
deps = 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}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
whitelist_externals = whitelist_externals =
...@@ -119,7 +119,7 @@ commands = ...@@ -119,7 +119,7 @@ commands =
[testenv:docs] [testenv:docs]
basepython = python3 basepython = python3
deps = 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}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
...@@ -142,7 +142,7 @@ commands = oslo_debug_helper {posargs} ...@@ -142,7 +142,7 @@ commands = oslo_debug_helper {posargs}
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3 basepython = python3
deps = 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}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
......
...@@ -54,8 +54,14 @@ ...@@ -54,8 +54,14 @@
- name: openstack/kayobe - name: openstack/kayobe
- name: openstack/kayobe-config-dev - name: openstack/kayobe-config-dev
- name: openstack/kolla - name: openstack/kolla
# TODO(wszumski): Remove when kayobe stable/train exists.
override-checkout: stable/train
- name: openstack/kolla-ansible - name: openstack/kolla-ansible
# TODO(wszumski): Remove when kayobe stable/train exists.
override-checkout: stable/train
- name: openstack/requirements - name: openstack/requirements
# TODO(wszumski): Remove when kayobe stable/train exists.
override-checkout: stable/train
- name: openstack/tenks - name: openstack/tenks
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment