openstack
/
project-config
Code Issues Proposed changes

Merge "Revert "Cap the subunit2sql version in the nodepool scripts""

This commit is contained in:
Jenkins 2015-03-18 14:13:40 +00:00 committed by Gerrit Code Review
parent 5e66767e42 8f7a206987
commit 8ae55a6364
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db
View File

@ -21,7 +21,7 @@ TEMPEST_DIR=/opt/git/openstack/tempest
# Setup venv and Install python deps from pip
sudo virtualenv /opt/git/subunit2sql-env
sudo -H /opt/git/subunit2sql-env/bin/pip install -U 'subunit2sql<0.4.0' testrepository PyMySQL
sudo -H /opt/git/subunit2sql-env/bin/pip install -U subunit2sql testrepository PyMySQL
sudo env PATH=/opt/git/subunit2sql-env/bin:$PATH /opt/git/subunit2sql-env/bin/python2 /opt/nodepool-scripts/prepare_tempest_testrepository.py $TEMPEST_DIR

2
nodepool/scripts/prepare_node_devstack.sh
View File

@ -27,7 +27,7 @@ sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack.sh "$HOSTNAME"
# Setup venv and install deps for prepare_tempest_testrepository.py
sudo virtualenv -p python2 /opt/git/subunit2sql-env
sudo -H /opt/git/subunit2sql-env/bin/pip install -U testrepository 'subunit2sql<0.4.0' PyMySQL
sudo -H /opt/git/subunit2sql-env/bin/pip install -U testrepository subunit2sql PyMySQL
# Pre-seed tempest testrepository with data from subunit2sql
sudo -i env PATH=/opt/git/subunit2sql-env/bin:$PATH /opt/git/subunit2sql-env/bin/python2 /opt/nodepool-scripts/prepare_tempest_testrepository.py $TEMPEST_DIR