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:
Kirill Zaitsev 2016-01-21 14:22:46 +03:00
parent b50564d65d
commit 26455ee925
3 changed files with 7 additions and 6 deletions

View File

@ -2,12 +2,13 @@
source ./run_tests_common.sh
MURANO_ROOT=/opt/stack/new/murano/murano
# Using .venv for tempest installation
pushd $TEMPEST_DIR
python tools/install_venv.py
source .venv/bin/activate
python "$MURANO_ROOT/tools/install_venv.py"
source "$MURANO_ROOT/.venv/bin/activate"
pip install nose
nosetests -sv /opt/stack/new/murano/murano/tests/functional/api/v1
nosetests -sv "$MURANO_ROOT/tests/functional/api/v1"
RETVAL=$?
deactivate
popd

View File

@ -58,8 +58,8 @@ def main(argv):
pip_requires = os.path.join(root, 'requirements.txt')
test_requires = os.path.join(root, 'test-requirements.txt')
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
setup_cfg = configparser.configparser()
setup_cfg.read('setup.cfg')
setup_cfg = configparser.ConfigParser()
setup_cfg.read(os.path.join(root, 'setup.cfg'))
project = setup_cfg.get('metadata', 'name')
install = install_venv.InstallVenv(

View File

@ -112,7 +112,7 @@ class InstallVenv(object):
# First things first, make sure our venv has the latest pip and
# setuptools and pbr
self.pip_install('pip>=1.4')
self.pip_install('pip>=1.4,<8')
self.pip_install('setuptools')
self.pip_install('pbr')