Browse Source

Use upper-constraints file when running tests

Currently, u-c is not uses so we are not using the versions specified in
requirements project.

Change-Id: Id0fd9e98103ff804a43f2d4485f72ac48df261c8
(cherry picked from commit e68d358532)
tags/12.0.1
Alfredo Moralejo 1 month ago
parent
commit
bc91243a4c
2 changed files with 7 additions and 5 deletions
  1. 3
    3
      run_tests.sh
  2. 4
    2
      tox.ini

+ 3
- 3
run_tests.sh View File

@@ -17,6 +17,8 @@ export PATH=$PATH:/usr/local/sbin:/usr/sbin
17 17
 
18 18
 SCENARIO=${SCENARIO:-scenario001}
19 19
 
20
+BRANCH=queens
21
+
20 22
 # We could want to override the default repositories or install behavior
21 23
 INSTALL_FROM_SOURCE=${INSTALL_FROM_SOURCE:-true}
22 24
 MANAGE_REPOS=${MANAGE_REPOS:-true}
@@ -240,9 +242,7 @@ fi
240 242
 if [ "${INSTALL_FROM_SOURCE}" = true ]; then
241 243
   # pycparser 2.19 seems to have trouble with older setuptools versions
242 244
   $SUDO pip install pycparser==2.18
243
-  # PyYAML > 5 has some issue with setuptools queens version(22.0.5), try installing stable version
244
-  $SUDO pip install PyYAML==3.12
245
-  $SUDO pip install .
245
+  $SUDO pip install --ignore-installed -c https://opendev.org/openstack/requirements/raw/branch/stable/$BRANCH/upper-constraints.txt .
246 246
   export GEM_BIN_DIR=/tmp/packstackgems/bin/
247 247
   export PUPPETFILE_DIR=/usr/share/openstack-puppet/modules
248 248
   export GEM_HOME=/tmp/packstackgems

+ 4
- 2
tox.ini View File

@@ -9,9 +9,11 @@ setenv = VIRTUAL_ENV={envdir}
9 9
          LANG=en_US.UTF-8
10 10
          LANGUAGE=en_US:en
11 11
          LC_ALL=C
12
+deps =
13
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/queens}
14
+  -r{toxinidir}/test-requirements.txt
15
+  -r{toxinidir}/requirements.txt
12 16
 
13
-deps = -r{toxinidir}/requirements.txt
14
-       -r{toxinidir}/test-requirements.txt
15 17
 commands = /usr/bin/find . -type f -name "*.pyc" -delete
16 18
            stestr run {posargs}
17 19
 

Loading…
Cancel
Save