Continue 2023.1 (Antelope) development

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

Change-Id: Id74b4d0e2bad8fa7a3629d85458b089e00a60211
This commit is contained in:
Brian Rosmaita 2023-03-29 15:57:06 -04:00
parent d3c48523cc
commit 18c81f0023
3 changed files with 23 additions and 7 deletions

View File

@ -15,7 +15,9 @@
- cinderlib-lvm-functional
- cinderlib-ceph-functional
- os-brick-src-tempest-lvm-lio-barbican
# NOTE: when cinderlib opens for 2023.2 development,
# use the parent job instead:
- cinderlib-os-brick-src-tempest-lvm-lio-barbican-2023.1
gate:
jobs:
- openstack-tox-pep8
@ -24,7 +26,9 @@
- cinderlib-lvm-functional
- cinderlib-ceph-functional
- os-brick-src-tempest-lvm-lio-barbican
# NOTE: when cinderlib opens for 2023.2 development,
# use the parent job instead:
- cinderlib-os-brick-src-tempest-lvm-lio-barbican-2023.1
post:
jobs:
- publish-openstack-python-branch-tarball
@ -34,24 +38,33 @@
parent: openstack-tox-py38
required-projects:
- name: openstack/os-brick
override-checkout: stable/2023.1
- name: openstack/cinder
override-checkout: stable/2023.1
- name: openstack/requirements
override-checkout: stable/2023.1
- job:
name: cinderlib-tox-py310
parent: openstack-tox-py310
required-projects:
- name: openstack/os-brick
override-checkout: stable/2023.1
- name: openstack/cinder
override-checkout: stable/2023.1
- name: openstack/requirements
override-checkout: stable/2023.1
- job:
name: cinderlib-tox-py311
parent: openstack-tox
required-projects:
- name: openstack/os-brick
override-checkout: stable/2023.1
- name: openstack/cinder
override-checkout: stable/2023.1
- name: openstack/requirements
override-checkout: stable/2023.1
# TODO: use the openstack-tox-py311 job as the parent
# when it becomes available in openstack/openstack-zuul-jobs
# and delete the following stuff
@ -66,8 +79,11 @@
parent: openstack-tox-functional-with-sudo
required-projects:
- name: openstack/os-brick
override-checkout: stable/2023.1
- name: openstack/cinder
override-checkout: stable/2023.1
- name: openstack/requirements
override-checkout: stable/2023.1
pre-run: playbooks/required-projects-bindeps.yaml
irrelevant-files:
- ^.*\.rst$

View File

@ -1,7 +1,7 @@
# restrict cinder to zed or later
cinder>=21.0.0.0 # Apache-2.0
# restrict cinder to the 2023.1 series only
cinder>=22.0.0,<23.0.0 # Apache-2.0
# brick upper bound is controlled by upper-constraints
os-brick>=6.1.0 # Apache-2.0
os-brick>=6.2.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.1
git+https://opendev.org/openstack/cinder@stable/2023.1
commands =
find . -ignore_readdir_race -type f -name "*.pyc" -delete