Continue 2023.2 (Bobcat) development

As a cycle-with-intermediary release with trailing deliverable type,
cinderlib's master remains the 2023.2 development branch until early
in the 2024.1 (Caracal) cycle when the cinderlib 2023.2 (Bobcat)
release is made.  So update tox.ini and .zuul.yaml to test against
cinder and os-brick stable/2023.2 instead of their master branches,
and restrict cinder and os-brick in requirements.txt to the 2023.2
series.

See the cinderlib docs for more info about this change:
https://docs.openstack.org/cinderlib/latest/contributor/contributing.html#cinderlib-tox-and-zuul-configuration-maintenance

Change-Id: I830b8e2f9766746a7f81b24ce1b7c1f4d4c7c5a1
This commit is contained in:
Brian Rosmaita
2023-09-25 12:08:43 -04:00
parent f1af46dc6a
commit ab28330d85
3 changed files with 26 additions and 16 deletions

View File

@@ -17,10 +17,9 @@
- cinderlib-lvm-functional
- cinderlib-ceph-functional
# NOTE: when the *cinder* stable/2023.2 branch has been cut, replace
- os-brick-src-tempest-lvm-lio-barbican
# with
# - cinderlib-os-brick-src-tempest-lvm-lio-barbican-2023.2
# NOTE: when cinderlib opens for 2024.1 development, use the parent
# job instead
- cinderlib-os-brick-src-tempest-lvm-lio-barbican-2023.2
gate:
jobs:
@@ -31,10 +30,9 @@
- cinderlib-lvm-functional
- cinderlib-ceph-functional
# NOTE: when the *cinder* stable/2023.2 branch has been cut, replace
- os-brick-src-tempest-lvm-lio-barbican
# with
# - cinderlib-os-brick-src-tempest-lvm-lio-barbican-2023.2
# NOTE: when cinderlib opens for 2024.1 development, use the parent
# job instead
- cinderlib-os-brick-src-tempest-lvm-lio-barbican-2023.2
post:
jobs:
- publish-openstack-python-branch-tarball
@@ -44,43 +42,55 @@
parent: openstack-tox-py38
required-projects:
- name: openstack/os-brick
override-checkout: stable/2023.2
- name: openstack/cinder
override-checkout: stable/2023.2
- name: openstack/requirements
override-checkout: stable/2023.2
- job:
name: cinderlib-tox-py39
parent: openstack-tox-py39
required-projects:
- name: openstack/os-brick
override-checkout: stable/2023.2
- name: openstack/cinder
override-checkout: stable/2023.2
- name: openstack/requirements
override-checkout: stable/2023.2
- job:
name: cinderlib-tox-py310
parent: openstack-tox-py310
required-projects:
- name: openstack/os-brick
override-checkout: stable/2023.2
- name: openstack/cinder
override-checkout: stable/2023.2
- name: openstack/requirements
override-checkout: stable/2023.2
- job:
name: cinderlib-tox-py311
parent: openstack-tox-py311
required-projects:
- name: openstack/os-brick
override-checkout: stable/2023.2
- name: openstack/cinder
override-checkout: stable/2023.2
- name: openstack/requirements
override-checkout: stable/2023.2
- job:
name: cinderlib-functional
parent: openstack-tox-functional-with-sudo
required-projects:
- name: openstack/os-brick
override-checkout: stable/2023.1
override-checkout: stable/2023.2
- name: openstack/cinder
override-checkout: stable/2023.1
override-checkout: stable/2023.2
- name: openstack/requirements
override-checkout: stable/2023.1
override-checkout: stable/2023.2
pre-run: playbooks/required-projects-bindeps.yaml
irrelevant-files:
- ^.*\.rst$

View File

@@ -1,7 +1,7 @@
# restrict cinder to 2023.1 or later
cinder>=22.0.0.0 # Apache-2.0
# restrict cinder to the 2023.2 series only
cinder>=23.0.0,<24.0.0 # Apache-2.0
# brick upper bound is controlled by upper-constraints
os-brick>=6.3.0 # Apache-2.0
os-brick>=6.4.0 # Apache-2.0
importlib_metadata>=1.7.0 # Apache-2.0
importlib_resources>=3.2.1;python_version<'3.10' # Apache-2.0

View File

@@ -36,8 +36,8 @@ usedevelop=True
# NOTE: Functional tests may fail if host is missing bindeps from deps projects
deps =
-r{toxinidir}/test-requirements.txt
git+https://opendev.org/openstack/os-brick
git+https://opendev.org/openstack/cinder
git+https://opendev.org/openstack/os-brick@stable/2023.2
git+https://opendev.org/openstack/cinder@stable/2023.2
commands =
find . -ignore_readdir_race -type f -name "*.pyc" -delete