Merge "Open cinderlib for 2023.2 (Bobcat) development"

.zuul.yaml

@@ -9,26 +9,31 @@
       jobs:
         - openstack-tox-pep8
         - cinderlib-tox-py38
+        - cinderlib-tox-py39
         - cinderlib-tox-py310
         - cinderlib-tox-py311:
             voting: false
 
         - cinderlib-lvm-functional
         - cinderlib-ceph-functional
-        # NOTE: when cinderlib opens for 2023.2 development,
-        # use the parent job instead:
-        - cinderlib-os-brick-src-tempest-lvm-lio-barbican-2023.1
+        # 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
+
     gate:
       jobs:
         - openstack-tox-pep8
         - cinderlib-tox-py38
+        - cinderlib-tox-py39
         - cinderlib-tox-py310
 
         - cinderlib-lvm-functional
         - cinderlib-ceph-functional
-        # NOTE: when cinderlib opens for 2023.2 development,
-        # use the parent job instead:
-        - cinderlib-os-brick-src-tempest-lvm-lio-barbican-2023.1
+        # 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
     post:
       jobs:
         - publish-openstack-python-branch-tarball
@@ -38,33 +43,32 @@
     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-py39
+    parent: openstack-tox-py39
+    required-projects:
+      - name: openstack/os-brick
+      - name: openstack/cinder
+      - name: openstack/requirements
 
 - 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
@@ -121,7 +125,7 @@
         NOSE_WITH_XUNIT: 1
 
 - job:
-    name: cinderlib-os-brick-src-tempest-lvm-lio-barbican-2023.1
+    name: cinderlib-os-brick-src-tempest-lvm-lio-barbican-2023.2
     parent: os-brick-src-tempest-lvm-lio-barbican
     description: |
       Use this job during the phase when cinderlib master is still
@@ -129,7 +133,7 @@
       cinderlib master and cinder master are the development branches
       for the *same* release, you should use the parent job directly
       in the check and gate, above.
-    override-checkout: stable/2023.1
-    # NOTE: while the cinderlib stable/2023.1 branch does not exist,
+    override-checkout: stable/2023.2
+    # NOTE: while the cinderlib stable/2023.2 branch does not exist,
     # zuul will fall back to using cinderlib master, which is the
     # behavior we want.

requirements.txt

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

tox.ini

@@ -22,7 +22,7 @@ setenv = OS_STDOUT_CAPTURE=1
          TOX_INI_DIR={toxinidir}
          # make sure this is accurate for current development, both here
          # and in [testenv:functional]
-         CINDERLIB_RELEASE=2023.1
+         CINDERLIB_RELEASE=2023.2
 usedevelop=True
 
 # note: cannot set the special local install command here because it is also
@@ -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@stable/2023.1
-    git+https://opendev.org/openstack/cinder@stable/2023.1
+    git+https://opendev.org/openstack/os-brick
+    git+https://opendev.org/openstack/cinder
 
 commands =
     find . -ignore_readdir_race -type f -name "*.pyc" -delete
@@ -73,7 +73,7 @@ setenv = OS_TEST_PATH=./cinderlib/tests/functional
          CL_FTEST_ROOT_HELPER={env:CL_FTEST_ROOT_HELPER:{toxinidir}/tools/virtualenv-sudo.sh}
          TOX_INI_DIR={toxinidir}
          # make sure this is accurate for current development
-         CINDERLIB_RELEASE=2023.1
+         CINDERLIB_RELEASE=2023.2
 
 sitepackages = True
 # Not reusing py37's env due to https://github.com/tox-dev/tox/issues/477
@@ -117,7 +117,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 # yes, we want the constraint in the install_command, not deps, so that
 # https://review.opendev.org/c/openstack/glance/+/839786 does not happen
 # to us
-install_command = python -m pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1} {opts} {packages}
+install_command = python -m pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2} {opts} {packages}
 deps =
   -r{toxinidir}/doc/requirements.txt
 commands =