diff --git a/ansible/inventory/group_vars/all/openstack b/ansible/inventory/group_vars/all/openstack index feee7469b82d0fd665035aed866bade7b35f2a8b..86bf653e7709652f20e05f24c59952966f6cd287 100644 --- a/ansible/inventory/group_vars/all/openstack +++ b/ansible/inventory/group_vars/all/openstack @@ -2,10 +2,10 @@ ############################################################################### # OpenStack release configuration. -# Name of the current OpenStack release. Default is "2023.2". -openstack_release: "2023.2" +# Name of the current OpenStack release. Default is "master". +openstack_release: "master" -# Name of the current OpenStack branch. Default is "stable/2023.2". +# 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 cb19104f784276c8f628e37f4027ddc76675c949..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 "2023.2". +# Name of the current OpenStack release. Default is "master". #openstack_release: -# Name of the current OpenStack branch. Default is "stable/2023.2". +# Name of the current OpenStack branch. Default is "master". #openstack_branch: ############################################################################### diff --git a/requirements.yml b/requirements.yml index 0f54f204365ffd26a43aaffc9323c8e3160fccfa..1e980756174bd7bc493fc7db6600ab2ad4a89974 100644 --- a/requirements.yml +++ b/requirements.yml @@ -2,7 +2,7 @@ collections: - name: https://opendev.org/openstack/ansible-collection-kolla type: git - version: stable/2023.2 + version: master - name: dellemc.os10 version: 1.1.1 - name: openstack.cloud diff --git a/tox.ini b/tox.ini index 5fa28e59decc785a49e99bbe31b532c4a8c297e7..7eba3afd823179f6c812e0dcf125b02be6bec08e 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ setenv = OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} @@ -28,7 +28,7 @@ commands = stestr run {posargs} [testenv:pep8] # sphinx8 needs the sphinx package which is required via doc/requirements.txt deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt -r{toxinidir}/test-requirements.txt @@ -43,7 +43,7 @@ commands = [testenv:venv] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt commands = {posargs} @@ -61,7 +61,7 @@ commands = [testenv:molecule] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/molecule-requirements.txt commands = @@ -112,7 +112,7 @@ commands = [testenv:docs] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2} + -c{env:TOX_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 2f4d80cc42b6bebbf014703ad01c7fea2acc532f..131ef7875c2fea1098b1884a316022fb03a7c75f 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -71,19 +71,11 @@ required-projects: # Include kayobe to ensure other projects can use this job. - name: openstack/ansible-collection-kolla - # TODO(mattcrees): Remove when kayobe stable/2023.2 exists. - override-checkout: stable/2023.2 - name: openstack/kayobe - name: openstack/kayobe-config-dev - name: openstack/kolla - # TODO(mattcrees): Remove when kayobe stable/2023.2 exists. - override-checkout: stable/2023.2 - name: openstack/kolla-ansible - # TODO(mattcrees): Remove when kayobe stable/2023.2 exists. - override-checkout: stable/2023.2 - name: openstack/requirements - # TODO(mattcrees): Remove when kayobe stable/2023.2 exists. - override-checkout: stable/2023.2 - name: openstack/tenks irrelevant-files: - ^\..+