openstack/kayobe
Code Issues Proposed changes

Revert "Use OpenStack Stein release"

Browse Source 
This reverts commit b46b2b72bbec2a076a8175fc0aff96cbdefcabff.

Switch dependencies and upper constraints back to master branch for
development after cutting stable/stein branch.

Change-Id: Ie7f588aab59e57efe240a58a3bd0a6f09fbcefb7
This commit is contained in:
Mark Goddard 2019-08-16 14:26:50 +01:00
parent 48c643abbe
commit ebe13df6f7
4 changed files with 10 additions and 16 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. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "stein". # Name of the current OpenStack release. Default is "master".
openstack_release: "stein" openstack_release: "master"
# Name of the current OpenStack branch. Default is "stable/stein". # Name of the current OpenStack branch. Default is "master".
openstack_branch: >- openstack_branch: >-
{% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }} {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}

4
etc/kayobe/openstack.yml
View File

@ -2,10 +2,10 @@
############################################################################### ###############################################################################
# OpenStack release configuration. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "stein". # Name of the current OpenStack release. Default is "master".
#openstack_release: #openstack_release:
# Name of the current OpenStack branch. Default is "stable/stein". # Name of the current OpenStack branch. Default is "master".
#openstack_branch: #openstack_branch:
############################################################################### ###############################################################################

10
tox.ini
View File

@ -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://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-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}
@ -37,7 +37,7 @@ commands =
[testenv:venv] [testenv:venv]
basepython = python3 basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-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 =
# 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://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
whitelist_externals = whitelist_externals =
@ -113,7 +113,7 @@ commands =
[testenv:docs] [testenv:docs]
basepython = python3 basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -W -b html doc/source doc/build/html commands = sphinx-build -W -b html doc/source doc/build/html
@ -125,7 +125,7 @@ commands = oslo_debug_helper {posargs}
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3 basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =

6
zuul.d/jobs.yaml
View File

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