Cap pip to <8 for dsvm job
Also update hooks to use murano install_venv and update script to fix all the typos Co-Authored-By: Nikolay Starodubtsev <starodubcevna@gmail.com> Co-Authored-By: Victor Ryzhenkin <vryzhenkin@mirantis.com> Closes-Bug: #1536614 Change-Id: I17de28570d543d30e80d41113425e32b0f4c26b2
This commit is contained in:
parent
b50564d65d
commit
26455ee925
|
@ -2,12 +2,13 @@
|
||||||
|
|
||||||
source ./run_tests_common.sh
|
source ./run_tests_common.sh
|
||||||
|
|
||||||
|
MURANO_ROOT=/opt/stack/new/murano/murano
|
||||||
# Using .venv for tempest installation
|
# Using .venv for tempest installation
|
||||||
pushd $TEMPEST_DIR
|
pushd $TEMPEST_DIR
|
||||||
python tools/install_venv.py
|
python "$MURANO_ROOT/tools/install_venv.py"
|
||||||
source .venv/bin/activate
|
source "$MURANO_ROOT/.venv/bin/activate"
|
||||||
pip install nose
|
pip install nose
|
||||||
nosetests -sv /opt/stack/new/murano/murano/tests/functional/api/v1
|
nosetests -sv "$MURANO_ROOT/tests/functional/api/v1"
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
deactivate
|
deactivate
|
||||||
popd
|
popd
|
||||||
|
|
|
@ -58,8 +58,8 @@ def main(argv):
|
||||||
pip_requires = os.path.join(root, 'requirements.txt')
|
pip_requires = os.path.join(root, 'requirements.txt')
|
||||||
test_requires = os.path.join(root, 'test-requirements.txt')
|
test_requires = os.path.join(root, 'test-requirements.txt')
|
||||||
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
|
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
|
||||||
setup_cfg = configparser.configparser()
|
setup_cfg = configparser.ConfigParser()
|
||||||
setup_cfg.read('setup.cfg')
|
setup_cfg.read(os.path.join(root, 'setup.cfg'))
|
||||||
project = setup_cfg.get('metadata', 'name')
|
project = setup_cfg.get('metadata', 'name')
|
||||||
|
|
||||||
install = install_venv.InstallVenv(
|
install = install_venv.InstallVenv(
|
||||||
|
|
|
@ -112,7 +112,7 @@ class InstallVenv(object):
|
||||||
|
|
||||||
# First things first, make sure our venv has the latest pip and
|
# First things first, make sure our venv has the latest pip and
|
||||||
# setuptools and pbr
|
# setuptools and pbr
|
||||||
self.pip_install('pip>=1.4')
|
self.pip_install('pip>=1.4,<8')
|
||||||
self.pip_install('setuptools')
|
self.pip_install('setuptools')
|
||||||
self.pip_install('pbr')
|
self.pip_install('pbr')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue