diff --git a/ansible/group_vars/all/openstack b/ansible/group_vars/all/openstack index e1d61ecef..19019ca80 100644 --- a/ansible/group_vars/all/openstack +++ b/ansible/group_vars/all/openstack @@ -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 "stein". +openstack_release: "stein" -# Name of the current OpenStack branch. Default is "master". +# Name of the current OpenStack branch. Default is "stable/stein". openstack_branch: >- {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }} diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index 1acfd0756..f9ef4478d 100644 --- a/etc/kayobe/openstack.yml +++ b/etc/kayobe/openstack.yml @@ -2,10 +2,10 @@ ############################################################################### # OpenStack release configuration. -# Name of the current OpenStack release. Default is "master". +# Name of the current OpenStack release. Default is "stein". #openstack_release: -# Name of the current OpenStack branch. Default is "master". +# Name of the current OpenStack branch. Default is "stable/stein". #openstack_branch: ############################################################################### diff --git a/tox.ini b/tox.ini index 325a0ee3b..3c4a3bd72 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ setenv = OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} @@ -37,7 +37,7 @@ commands = [testenv:venv] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt commands = {posargs} @@ -60,7 +60,7 @@ commands = # Molecule only supports python 2.7 and 3.6. basepython = python2 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt whitelist_externals = @@ -113,7 +113,7 @@ commands = [testenv:docs] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -b html doc/source doc/build/html @@ -125,7 +125,7 @@ commands = oslo_debug_helper {posargs} [testenv:releasenotes] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index da9e71f28..2c3141a63 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -58,8 +58,14 @@ - name: x/kayobe - name: x/kayobe-config-dev - name: openstack/kolla + # TODO(mgoddard): Remove when kayobe stable/stein exists. + override-checkout: stable/stein - name: openstack/kolla-ansible + # TODO(mgoddard): Remove when kayobe stable/stein exists. + override-checkout: stable/stein - name: openstack/requirements + # TODO(mgoddard): Remove when kayobe stable/stein exists. + override-checkout: stable/stein - name: openstack/tenks irrelevant-files: - ^.*\.rst$