openstack/kayobe
Code Issues Proposed changes

Revert "Use OpenStack Zed release"

Browse Source 
This reverts commit 65c59b9f5939f19f5fb914dbcb0fc64cde99771b.

Reason for revert: Zed has been branched and released

Change-Id: I2d87017c27139b5e0154edef006ad61d665ede2a
This commit is contained in:
Bartosz Bezak 2023-01-10 09:50:04 +00:00
parent ebd5799fd4
commit 0c11102afe
5 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/inventory/group_vars/all/openstack
View File

@ -2,10 +2,10 @@
############################################################################### ###############################################################################
# OpenStack release configuration. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "zed". # Name of the current OpenStack release. Default is "master".
openstack_release: "zed" openstack_release: "master"
# Name of the current OpenStack branch. Default is "stable/zed". # 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 "zed". # Name of the current OpenStack release. Default is "master".
#openstack_release: #openstack_release:
# Name of the current OpenStack branch. Default is "stable/zed". # Name of the current OpenStack branch. Default is "master".
#openstack_branch: #openstack_branch:
############################################################################### ###############################################################################

2
requirements.yml
View File

@ -2,7 +2,7 @@
collections: collections:
- name: https://opendev.org/openstack/ansible-collection-kolla - name: https://opendev.org/openstack/ansible-collection-kolla
type: git type: git
version: stable/zed version: master
- name: dellemc.os10 - name: dellemc.os10
version: 1.1.1 version: 1.1.1

10
tox.ini
View File

@ -20,7 +20,7 @@ setenv =
OS_STDERR_CAPTURE=1 OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60 OS_TEST_TIMEOUT=60
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/zed} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-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}
@ -28,7 +28,7 @@ commands = stestr run {posargs}
[testenv:pep8] [testenv:pep8]
# sphinx8 needs the sphinx package which is required via doc/requirements.txt # sphinx8 needs the sphinx package which is required via doc/requirements.txt
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/zed} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
@ -43,7 +43,7 @@ commands =
[testenv:venv] [testenv:venv]
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/zed} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
@ -61,7 +61,7 @@ commands =
[testenv:molecule] [testenv:molecule]
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/zed} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/molecule-requirements.txt -r{toxinidir}/molecule-requirements.txt
commands = commands =
@ -108,7 +108,7 @@ commands =
[testenv:docs] [testenv:docs]
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/zed} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
rm -rf doc/build/html rm -rf doc/build/html

8
zuul.d/jobs.yaml
View File

@ -66,19 +66,11 @@
required-projects: required-projects:
# Include kayobe to ensure other projects can use this job. # Include kayobe to ensure other projects can use this job.
- name: openstack/ansible-collection-kolla - name: openstack/ansible-collection-kolla
# TODO(bbezak): Remove when kayobe stable/zed exists.
override-checkout: stable/zed
- name: openstack/kayobe - name: openstack/kayobe
- name: openstack/kayobe-config-dev - name: openstack/kayobe-config-dev
- name: openstack/kolla - name: openstack/kolla
# TODO(bbezak): Remove when kayobe stable/zed exists.
override-checkout: stable/zed
- name: openstack/kolla-ansible - name: openstack/kolla-ansible
# TODO(bbezak): Remove when kayobe stable/zed exists.
override-checkout: stable/zed
- name: openstack/requirements - name: openstack/requirements
# TODO(bbezak): Remove when kayobe stable/zed exists.
override-checkout: stable/zed
- name: openstack/tenks - name: openstack/tenks
irrelevant-files: irrelevant-files:
- ^\..+ - ^\..+