diff --git a/ansible/group_vars/all/openstack b/ansible/group_vars/all/openstack index c91d10a46591a808d9505b4b56575ee19cc89cf8..86bf653e7709652f20e05f24c59952966f6cd287 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 "victoria". -openstack_release: "victoria" +# Name of the current OpenStack release. Default is "master". +openstack_release: "master" -# Name of the current OpenStack branch. Default is "stable/victoria". +# Name of the current OpenStack branch. Default is "master". openstack_branch: >- {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }} diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index fcae97ff21855196176508e21c9bdf0baa1c2414..1acfd0756633b75caa10ca655b18ff960ada5908 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 "victoria". +# Name of the current OpenStack release. Default is "master". #openstack_release: -# Name of the current OpenStack branch. Default is "stable/victoria". +# Name of the current OpenStack branch. Default is "master". #openstack_branch: ############################################################################### diff --git a/tox.ini b/tox.ini index d845d39dcb9eb2968b0e1d9115de98d9cc262a0e..5914157cc1c93d71ef1761c40bca4451fda96c89 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/victoria} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -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/victoria} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -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/victoria} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -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/victoria} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt whitelist_externals = @@ -109,7 +109,7 @@ commands = [testenv:docs] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt commands = rm -rf doc/build/html diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 1bcea35ffc688fb56524a9f0693d6b72c8cfc885..c7b9bfe53377eb3606655e14bac39b7c68c92a7d 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -35,9 +35,7 @@ pre-run: playbooks/kayobe-tox-molecule/pre.yml timeout: 3600 required-projects: - - name: openstack/requirements - # TODO: remove after branching - override-checkout: stable/victoria + - openstack/requirements vars: tox_envlist: molecule irrelevant-files: @@ -58,14 +56,8 @@ - name: openstack/kayobe - name: openstack/kayobe-config-dev - name: openstack/kolla - # TODO: remove after branching - override-checkout: stable/victoria - name: openstack/kolla-ansible - # TODO: remove after branching - override-checkout: stable/victoria - name: openstack/requirements - # TODO: remove after branching - override-checkout: stable/victoria - name: openstack/tenks irrelevant-files: - ^.*\.rst$