openstack
/
kayobe
Code Issues Proposed changes

[release] Use OpenStack Yoga release 

Switch all dependencies to use the OpenStack Yoga release.

This commit should be reverted on the master branch once the
Kayobe stable/yoga branch has been cut and RC1 released.

Change-Id: Ib7495c1bf79de8b1ea67e4a8652345c22e9d1a3e
This commit is contained in:
Mark Goddard 2022-03-31 17:20:17 +01:00
parent 7b8c2fa6a6
commit 88dd02dc92
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/group_vars/all/openstack
View File

@ -2,10 +2,10 @@
############################################################################### ###############################################################################
# OpenStack release configuration. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "master". # Name of the current OpenStack release. Default is "yoga".
openstack_release: "master" openstack_release: "yoga"
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/yoga".
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 "master". # Name of the current OpenStack release. Default is "yoga".
#openstack_release: #openstack_release:
# Name of the current OpenStack branch. Default is "master". # Name of the current OpenStack branch. Default is "stable/yoga".
#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: master version: stable/yoga
roles: roles:
- src: ahuffman.resolv - src: ahuffman.resolv
version: 1.3.1 version: 1.3.1

10
tox.ini
View File

@ -19,7 +19,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/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
-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}
@ -27,7 +27,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/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
-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
@ -42,7 +42,7 @@ commands =
[testenv:venv] [testenv:venv]
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
@ -62,7 +62,7 @@ commands =
deps = deps =
# TODO(priteau): Restore upper constraints once molecule dependency # TODO(priteau): Restore upper constraints once molecule dependency
# resolution is working # resolution is working
#-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} #-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/molecule-requirements.txt -r{toxinidir}/molecule-requirements.txt
whitelist_externals = whitelist_externals =
@ -111,7 +111,7 @@ commands =
[testenv:docs] [testenv:docs]
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
-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

@ -59,11 +59,19 @@
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(mgoddard): Remove when kayobe stable/yoga exists.
override-checkout: stable/yoga
- name: openstack/kayobe - name: openstack/kayobe
- name: openstack/kayobe-config-dev - name: openstack/kayobe-config-dev
- name: openstack/kolla - name: openstack/kolla
# TODO(mgoddard): Remove when kayobe stable/yoga exists.
override-checkout: stable/yoga
- name: openstack/kolla-ansible - name: openstack/kolla-ansible
# TODO(mgoddard): Remove when kayobe stable/yoga exists.
override-checkout: stable/yoga
- name: openstack/requirements - name: openstack/requirements
# TODO(mgoddard): Remove when kayobe stable/yoga exists.
override-checkout: stable/yoga
- name: openstack/tenks - name: openstack/tenks
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$