Skip to content
Snippets Groups Projects
Commit 074024d6 authored by Michal Nasiadka's avatar Michal Nasiadka
Browse files

Use OpenStack Victoria release

Switch all dependencies to use the OpenStack Victoria release.

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

Change-Id: I7f1113577fd48aa0715b644cc66bfca197771ca6
parent 51dc10c6
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 "victoria".
openstack_release: "master" openstack_release: "victoria"
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/victoria".
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 "victoria".
#openstack_release: #openstack_release:
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/victoria".
#openstack_branch: #openstack_branch:
############################################################################### ###############################################################################
......
...@@ -19,7 +19,7 @@ setenv = ...@@ -19,7 +19,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/victoria}
-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}
[testenv:pep8] [testenv:pep8]
# 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/victoria}
-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
...@@ -42,7 +42,7 @@ commands = ...@@ -42,7 +42,7 @@ commands =
[testenv:venv] [testenv:venv]
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/victoria}
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
...@@ -60,7 +60,7 @@ commands = ...@@ -60,7 +60,7 @@ commands =
[testenv:molecule] [testenv:molecule]
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/victoria}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
whitelist_externals = whitelist_externals =
...@@ -109,7 +109,7 @@ commands = ...@@ -109,7 +109,7 @@ commands =
[testenv:docs] [testenv:docs]
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/victoria}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
rm -rf doc/build/html rm -rf doc/build/html
......
...@@ -35,7 +35,9 @@ ...@@ -35,7 +35,9 @@
pre-run: playbooks/kayobe-tox-molecule/pre.yml pre-run: playbooks/kayobe-tox-molecule/pre.yml
timeout: 3600 timeout: 3600
required-projects: required-projects:
- openstack/requirements - name: openstack/requirements
# TODO: remove after branching
override-checkout: stable/victoria
vars: vars:
tox_envlist: molecule tox_envlist: molecule
irrelevant-files: irrelevant-files:
...@@ -56,8 +58,14 @@ ...@@ -56,8 +58,14 @@
- name: openstack/kayobe - name: openstack/kayobe
- name: openstack/kayobe-config-dev - name: openstack/kayobe-config-dev
- name: openstack/kolla - name: openstack/kolla
# TODO: remove after branching
override-checkout: stable/victoria
- name: openstack/kolla-ansible - name: openstack/kolla-ansible
# TODO: remove after branching
override-checkout: stable/victoria
- name: openstack/requirements - name: openstack/requirements
# TODO: remove after branching
override-checkout: stable/victoria
- 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