Skip to content

Commit

Permalink
Use OpenStack 2023.1 release
Browse files Browse the repository at this point in the history
Switch all dependencies to use the OpenStack 2023.1 release.

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

Change-Id: Id5e946fd7b0526faea99536f4a055f0f5c2b8176
  • Loading branch information
MoteHue authored and mnasiadka committed May 29, 2023
1 parent 0e984c4 commit 16a61da
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 11 deletions.
6 changes: 3 additions & 3 deletions ansible/inventory/group_vars/all/openstack
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
###############################################################################
# OpenStack release configuration.

# Name of the current OpenStack release. Default is "master".
openstack_release: "master"
# Name of the current OpenStack release. Default is "2023.1".
openstack_release: "2023.1"

# Name of the current OpenStack branch. Default is "master".
# Name of the current OpenStack branch. Default is "stable/2023.1".
openstack_branch: >-
{% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}

Expand Down
4 changes: 2 additions & 2 deletions etc/kayobe/openstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
###############################################################################
# OpenStack release configuration.

# Name of the current OpenStack release. Default is "master".
# Name of the current OpenStack release. Default is "2023.1".
#openstack_release:

# Name of the current OpenStack branch. Default is "master".
# Name of the current OpenStack branch. Default is "stable/2023.1".
#openstack_branch:

###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
collections:
- name: https://opendev.org/openstack/ansible-collection-kolla
type: git
version: master
version: stable/2023.1
- name: dellemc.os10
version: 1.1.1

Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ setenv =
OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
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/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
-r{toxinidir}/test-requirements.txt
Expand All @@ -43,7 +43,7 @@ commands =

[testenv:venv]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt
commands = {posargs}
Expand All @@ -61,7 +61,7 @@ commands =

[testenv:molecule]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/requirements.txt
-r{toxinidir}/molecule-requirements.txt
commands =
Expand Down Expand Up @@ -112,7 +112,7 @@ commands =

[testenv:docs]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/doc/requirements.txt
commands =
rm -rf doc/build/html
Expand Down
8 changes: 8 additions & 0 deletions zuul.d/jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,19 @@
required-projects:
# Include kayobe to ensure other projects can use this job.
- name: openstack/ansible-collection-kolla
# TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
override-checkout: stable/2023.1
- name: openstack/kayobe
- name: openstack/kayobe-config-dev
- name: openstack/kolla
# TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
override-checkout: stable/2023.1
- name: openstack/kolla-ansible
# TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
override-checkout: stable/2023.1
- name: openstack/requirements
# TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
override-checkout: stable/2023.1
- name: openstack/tenks
irrelevant-files:
- ^\..+
Expand Down

0 comments on commit 16a61da

Please sign in to comment.