From 0c0879a6810273884556bbab6791e223e3768551 Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Thu, 15 Dec 2022 16:38:34 -0500 Subject: [PATCH] Open cinderlib for 2023.1 (Antelope) development See "cinderlib tox and zuul configuration maintenance" in https://docs.openstack.org/cinderlib/latest/contributor/contributing.html for an explanation of these changes. Change-Id: I68d038a3a64a81e6bd21e65423898d9f5b514234 --- .zuul.yaml | 52 ++++++++++++++++++++++-------------------------- requirements.txt | 6 +++--- setup.cfg | 1 + tox.ini | 17 +++++++++------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 0f65d3c..f32afd2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -7,22 +7,22 @@ jobs: - openstack-tox-pep8 - cinderlib-tox-py38 - - cinderlib-tox-py39 - - cinderlib-tox-py310: + - cinderlib-tox-py310 + - cinderlib-tox-py311: voting: false - cinderlib-lvm-functional - cinderlib-ceph-functional - - cinderlib-os-brick-src-tempest-lvm-lio-barbican-zed + - os-brick-src-tempest-lvm-lio-barbican gate: jobs: - openstack-tox-pep8 - cinderlib-tox-py38 - - cinderlib-tox-py39 + - cinderlib-tox-py310 - cinderlib-lvm-functional - cinderlib-ceph-functional - - cinderlib-os-brick-src-tempest-lvm-lio-barbican-zed + - os-brick-src-tempest-lvm-lio-barbican post: jobs: - publish-openstack-python-branch-tarball @@ -32,44 +32,40 @@ parent: openstack-tox-py38 required-projects: - name: openstack/os-brick - override-checkout: stable/zed - name: openstack/cinder - override-checkout: stable/zed - name: openstack/requirements - override-checkout: stable/zed - -- job: - name: cinderlib-tox-py39 - parent: openstack-tox-py39 - required-projects: - - name: openstack/os-brick - override-checkout: stable/zed - - name: openstack/cinder - override-checkout: stable/zed - - name: openstack/requirements - override-checkout: stable/zed - job: name: cinderlib-tox-py310 parent: openstack-tox-py310 required-projects: - name: openstack/os-brick - override-checkout: stable/zed - name: openstack/cinder - override-checkout: stable/zed - name: openstack/requirements - override-checkout: stable/zed + +- job: + name: cinderlib-tox-py311 + parent: openstack-tox + required-projects: + - name: openstack/os-brick + - name: openstack/cinder + - name: openstack/requirements + # TODO: use the openstack-tox-py311 job as the parent + # when it becomes available in openstack/openstack-zuul-jobs + # and delete the following stuff + nodeset: ubuntu-jammy + timeout: 2400 + vars: + tox_envlist: py311 + python_version: '3.11' - job: name: cinderlib-functional parent: openstack-tox-functional-with-sudo required-projects: - name: openstack/os-brick - override-checkout: stable/zed - name: openstack/cinder - override-checkout: stable/zed - name: openstack/requirements - override-checkout: stable/zed pre-run: playbooks/required-projects-bindeps.yaml irrelevant-files: - ^.*\.rst$ @@ -107,7 +103,7 @@ NOSE_WITH_XUNIT: 1 - job: - name: cinderlib-os-brick-src-tempest-lvm-lio-barbican-zed + name: cinderlib-os-brick-src-tempest-lvm-lio-barbican-2023.1 parent: os-brick-src-tempest-lvm-lio-barbican description: | Use this job during the phase when cinderlib master is still @@ -115,7 +111,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/zed - # NOTE: while the cinderlib stable/zed branch does not exist, + override-checkout: stable/2023.1 + # NOTE: while the cinderlib stable/2023.1 branch does not exist, # zuul will fall back to using cinderlib master, which is the # behavior we want. diff --git a/requirements.txt b/requirements.txt index 1467d1a..73d3043 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -# restrict cinder to the zed release only -cinder>=21.0.0.0,<22.0.0 # Apache-2.0 -# brick upper bound is controlled by zed/upper-constraints +# restrict cinder to zed or later +cinder>=21.0.0.0 # Apache-2.0 +# brick upper bound is controlled by upper-constraints os-brick>=6.1.0 # Apache-2.0 importlib_metadata>=1.7.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index d265b7f..9807b23 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,6 +22,7 @@ classifiers = Programming Language :: Python :: 3 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 [files] packages = diff --git a/tox.ini b/tox.ini index 946f4a7..d8e422e 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,8 @@ 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=zed + # FIXME: change this to '2023.1' when the u-c redirect is available + CINDERLIB_RELEASE=antelope usedevelop=True # note: cannot set the special local install command here because it is also @@ -31,8 +32,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/zed#egg=os-brick - git+https://opendev.org/openstack/cinder@stable/zed#egg=cinder + git+https://opendev.org/openstack/os-brick#egg=os-brick + git+https://opendev.org/openstack/cinder#egg=cinder commands = find . -ignore_readdir_race -type f -name "*.pyc" -delete @@ -51,7 +52,7 @@ allowlist_externals = find passenv = *_proxy *_PROXY CINDERLIB_CONSTRAINTS_FILE -[testenv:py{3,38,39,310}] +[testenv:py{3,38,39,310,311}] install_command = {toxinidir}/tools/special_install.sh {env:PIP_OPTIONS:} {opts} {packages} [testenv:functional] @@ -63,7 +64,8 @@ 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=zed + # FIXME: change this to '2023.1' when the u-c redirect is available + CINDERLIB_RELEASE=antelope sitepackages = True # Not reusing py37's env due to https://github.com/tox-dev/tox/issues/477 @@ -82,7 +84,7 @@ allowlist_externals = {[testenv]allowlist_externals} stestr -[testenv:functional-py{38,39,310}] +[testenv:functional-py{38,39,310,311}] install_command = {[testenv:functional]install_command} usedevelop=True passenv = @@ -107,7 +109,8 @@ 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/zed} {opts} {packages} +# FIXME: change 'antelope' to '2023.1' when the u-c redirect is available +install_command = python -m pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/antelope} {opts} {packages} deps = -r{toxinidir}/doc/requirements.txt commands =