openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Fixing setuptools version"

This commit is contained in:
Jenkins 2017-01-26 15:31:52 +00:00 committed by Gerrit Code Review
parent b97b13b83c ebf252cbec
commit 771bdb149a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/validate-tempest/templates/configure-tempest.sh.j2
View File

@ -64,7 +64,8 @@ cd {{ working_dir }}/tempest
git clone https://github.com/redhat-openstack/tempest {{ working_dir }}/tempest
cd {{ working_dir }}/tempest
virtualenv --no-site-packages .venv
./tools/with_venv.sh pip install -U pip setuptools
# Fix version for setuptools due https://github.com/pypa/setuptools/issues/945
./tools/with_venv.sh pip install -U pip setuptools==33.1.1
./tools/with_venv.sh pip install junitxml httplib2 -r test-requirements.txt -r requirements.txt
{% endif %}
@ -72,7 +73,8 @@ virtualenv --no-site-packages .venv
git clone https://github.com/openstack/tempest {{ working_dir }}/tempest
cd {{ working_dir }}/tempest
virtualenv --no-site-packages .venv
./tools/with_venv.sh pip install -U pip setuptools
# Fix version for setuptools due https://github.com/pypa/setuptools/issues/945
./tools/with_venv.sh pip install -U pip setuptools==33.1.1
./tools/with_venv.sh pip install junitxml httplib2 -r test-requirements.txt -r requirements.txt
cp /usr/share/openstack-tempest-*/tools/config_tempest.py ./tools/
cp /usr/share/openstack-tempest-*/tools/run-tests.sh ./tools/