diff --git a/.zuul.yaml b/.zuul.yaml index 202a3fa..1460500 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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$ diff --git a/requirements.txt b/requirements.txt index 73d3043..e4fb968 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/tox.ini b/tox.ini index af4e5ea..5579cf6 100644 --- a/tox.ini +++ b/tox.ini @@ -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