openstack/kayobe
Code Issues Proposed changes

Merge "Revert "Use OpenStack 2023.2 release""

Browse Source
This commit is contained in:
Zuul 2023-12-12 13:33:50 +00:00 committed by Gerrit Code Review
commit bb2af07567
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.
# 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 }}

4
etc/kayobe/openstack.yml
View File

@ -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:
###############################################################################

2
requirements.yml
View File

@ -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

10
tox.ini
View File

@ -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

8
zuul.d/jobs.yaml
View File

@ -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:
- ^\..+