From 8f7a20698726a2036d3d5fa68ef63e2212399f5e Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 16 Mar 2015 15:13:05 +0000 Subject: [PATCH] Revert "Cap the subunit2sql version in the nodepool scripts" Once the migration has been run manually we need to use subunit2sql>=0.4.0 because that is the version of the DB schema running on the infra db. This reverts commit aa87c57ca7fe95f9785719acb6b626f12171e240. Change-Id: I747083bc15ecda7e1926a87c2adcdaf29e565e23 --- .../cache-devstack/install.d/99-cache-testrepository-db | 2 +- nodepool/scripts/prepare_node_devstack.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db b/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db index c96d039231..8b636086a9 100755 --- a/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db +++ b/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db @@ -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 diff --git a/nodepool/scripts/prepare_node_devstack.sh b/nodepool/scripts/prepare_node_devstack.sh index 8e9efb0256..93457f7852 100755 --- a/nodepool/scripts/prepare_node_devstack.sh +++ b/nodepool/scripts/prepare_node_devstack.sh @@ -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