diff --git a/ansible/group_vars/all/openstack b/ansible/group_vars/all/openstack index 86bf653e7709652f20e05f24c59952966f6cd287..431d93b40de037e7998ed19fb71e165a4e8acf86 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 "ussuri". +openstack_release: "ussuri" -# Name of the current OpenStack branch. Default is "master". +# Name of the current OpenStack branch. Default is "stable/ussuri". openstack_branch: >- {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }} diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index 1acfd0756633b75caa10ca655b18ff960ada5908..7a29298b66bb4bb0eb45fafa47f58a5babee94ad 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 "ussuri". #openstack_release: -# Name of the current OpenStack branch. Default is "master". +# Name of the current OpenStack branch. Default is "stable/ussuri". #openstack_branch: ############################################################################### diff --git a/tox.ini b/tox.ini index 76c1f771c36b58edff1f3843e25c9a1eda29486c..d0822f6629392f5f9abfeadab420f6cfca9f0b46 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,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/ussuri} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} @@ -27,7 +27,7 @@ commands = stestr run {posargs} [testenv:pep8] # 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/ussuri} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt -r{toxinidir}/test-requirements.txt @@ -42,7 +42,7 @@ commands = [testenv:venv] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt commands = {posargs} @@ -60,7 +60,7 @@ commands = [testenv:molecule] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt whitelist_externals = @@ -109,7 +109,7 @@ commands = [testenv:docs] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = @@ -129,7 +129,7 @@ commands = oslo_debug_helper {posargs} [testenv:releasenotes] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index bca1f29a522cd8029d6dd813ae8cf06d533495aa..a404d571463a1eac05d166be73d4b4ab7be81380 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -56,8 +56,14 @@ - name: openstack/kayobe - name: openstack/kayobe-config-dev - name: openstack/kolla + # TODO(mgoddard): Remove when kayobe stable/ussuri exists. + override-checkout: stable/ussuri - name: openstack/kolla-ansible + # TODO(mgoddard): Remove when kayobe stable/ussuri exists. + override-checkout: stable/ussuri - name: openstack/requirements + # TODO(mgoddard): Remove when kayobe stable/ussuri exists. + override-checkout: stable/ussuri - name: openstack/tenks irrelevant-files: - ^.*\.rst$