Merge "Continue wallaby development"

lower-constraints.txt

@@ -1,6 +1,6 @@
-cinder==17.0.0
+cinder==18.0.0
 mock==2.0.0
-os-brick==4.0.1
+os-brick==4.3.1
 oslo.context==2.23.0
 oslo.db==6.0.0
 pbr==5.4.1

requirements.txt

@@ -1,2 +1,6 @@
-cinder>=17.0.0 # Apache-2.0
+# restrict cinder to the wallaby series only
+cinder>=18.0.0,<19.0.0 # Apache-2.0
+# specify brick wallaby (upper bound controlled by openstack upper-constraints)
+os-brick>=4.3.1
+
 importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0

tox.ini

@@ -15,15 +15,17 @@ setenv = OS_STDOUT_CAPTURE=1
          OS_TEST_TIMEOUT=60
          OS_TEST_PATH=./cinderlib/tests/unit
 usedevelop=True
-install_command = pip install {env:PIP_OPTIONS:} {opts} {packages}
-# Use cinder from master instead of from PyPi. Defining the egg name we won't
-# overwrite the package installed by Zuul on jobs supporting cross-project
-# dependencies (include Cinder in required-projects).  This allows us to also
-# run local tests against master.
+install_command = python -m pip install {env:PIP_OPTIONS:} {opts} {packages}
+# Use cinder and os-brick from the appropriate development branch instead of
+# from PyPi.  Defining the egg name we won't overwrite the package installed
+# by Zuul on jobs supporting cross-project dependencies (include Cinder in
+# required-projects).  This allows us to also run local tests against the
+# latest cinder/brick code instead of released code.
 # 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#egg=os-brick
-      git+https://opendev.org/openstack/cinder#egg=cinder
+deps =
+    -r{toxinidir}/test-requirements.txt
+    git+https://opendev.org/openstack/os-brick@stable/wallaby#egg=os-brick
+    git+https://opendev.org/openstack/cinder@stable/wallaby#egg=cinder
 
 commands =
     find . -ignore_readdir_race -type f -name "*.pyc" -delete
@@ -85,13 +87,13 @@ allowlist_externals = {[testenv:functional]allowlist_externals}
 # Not reusing doc's env due to https://github.com/tox-dev/tox/issues/477
 # envdir = {toxworkdir}/docs
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:docs]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
   -r{toxinidir}/doc/requirements.txt
 commands =
   doc8 --ignore D001 --ignore-path .tox --ignore-path *.egg-info --ignore-path doc/build --ignore-path .eggs/*/EGG-INFO/*.txt -e txt -e rst