From 48f4fa52f9ebc2673ef8c559791a3c9355b15f07 Mon Sep 17 00:00:00 2001 From: Amrith Kumar Date: Fri, 16 Dec 2016 06:13:15 -0500 Subject: [PATCH] Fix Gate: Force pip2 instead of pip Something appears to have caused the xenial guests to install all python libraries into python 3.5 directories and therefore the guest won't launch. This change forces pip2 and in theory should get around that. Moved Redis and PostgreSQL installs after the trove-dep ones. Change-Id: I3bbe3bafa7ea3e627272103ac16a38f6a32a8a06 Partial-Bug: #1650382 --- .../files/elements/ubuntu-cassandra/install.d/10-cassandra | 4 ++-- .../files/elements/ubuntu-guest/install.d/15-trove-dep | 4 ++-- .../elements/ubuntu-mongodb/install.d/25-trove-mongo-dep | 2 +- .../install.d/{10-postgresql => 30-postgresql} | 2 +- .../elements/ubuntu-redis/install.d/{10-redis => 30-redis} | 4 ++-- .../install.d/{11-fix-init-script => 31-fix-init-script} | 0 .../install.d/{11-fix-init-file => 31-fix-init-file} | 0 7 files changed, 8 insertions(+), 8 deletions(-) rename integration/scripts/files/elements/ubuntu-postgresql/install.d/{10-postgresql => 30-postgresql} (99%) rename integration/scripts/files/elements/ubuntu-redis/install.d/{10-redis => 30-redis} (97%) rename integration/scripts/files/elements/ubuntu-xenial-postgresql/install.d/{11-fix-init-script => 31-fix-init-script} (100%) rename integration/scripts/files/elements/ubuntu-xenial-redis/install.d/{11-fix-init-file => 31-fix-init-file} (100%) diff --git a/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra b/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra index 2bd40181c1..aa9e24bfa9 100755 --- a/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra +++ b/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra @@ -16,9 +16,9 @@ apt-get install -qy python-migrate build-essential apt-get install dsc21=2.1.* cassandra=2.1.* -qy # The Python Driver 2.0 for Apache Cassandra. -pip install cassandra-driver +pip2 install cassandra-driver # Sorted sets support for the Python driver. -pip install blist +pip2 install blist service cassandra stop rm -rf /var/lib/cassandra/data/system/* diff --git a/integration/scripts/files/elements/ubuntu-guest/install.d/15-trove-dep b/integration/scripts/files/elements/ubuntu-guest/install.d/15-trove-dep index 28d9172e1a..697d3610d0 100755 --- a/integration/scripts/files/elements/ubuntu-guest/install.d/15-trove-dep +++ b/integration/scripts/files/elements/ubuntu-guest/install.d/15-trove-dep @@ -24,8 +24,8 @@ if [ -f ${TMP_HOOKS_DIR}/upper-constraints.txt ]; then UPPER_CONSTRAINTS=" -c ${TMP_HOOKS_DIR}/upper-constraints.txt" fi -pip install -q --upgrade -r ${TMP_HOOKS_DIR}/requirements.txt ${UPPER_CONSTRAINTS} +pip2 install -q --upgrade -r ${TMP_HOOKS_DIR}/requirements.txt ${UPPER_CONSTRAINTS} echo "diagnostic pip freeze output follows" -pip freeze +pip2 freeze echo "diagnostic pip freeze output above" diff --git a/integration/scripts/files/elements/ubuntu-mongodb/install.d/25-trove-mongo-dep b/integration/scripts/files/elements/ubuntu-mongodb/install.d/25-trove-mongo-dep index 7be7ef9516..a8b3ddc022 100755 --- a/integration/scripts/files/elements/ubuntu-mongodb/install.d/25-trove-mongo-dep +++ b/integration/scripts/files/elements/ubuntu-mongodb/install.d/25-trove-mongo-dep @@ -6,4 +6,4 @@ set -e set -o xtrace -pip install pymongo>=3.0.2,!=3.1 +pip2 install pymongo>=3.0.2,!=3.1 diff --git a/integration/scripts/files/elements/ubuntu-postgresql/install.d/10-postgresql b/integration/scripts/files/elements/ubuntu-postgresql/install.d/30-postgresql similarity index 99% rename from integration/scripts/files/elements/ubuntu-postgresql/install.d/10-postgresql rename to integration/scripts/files/elements/ubuntu-postgresql/install.d/30-postgresql index cd85325667..f3a107a4ae 100755 --- a/integration/scripts/files/elements/ubuntu-postgresql/install.d/10-postgresql +++ b/integration/scripts/files/elements/ubuntu-postgresql/install.d/30-postgresql @@ -76,4 +76,4 @@ apt-get remove -y $dev_pkgs # Install the native Python client. apt-get -y install libpq-dev -pip install psycopg2 +pip2 install psycopg2 diff --git a/integration/scripts/files/elements/ubuntu-redis/install.d/10-redis b/integration/scripts/files/elements/ubuntu-redis/install.d/30-redis similarity index 97% rename from integration/scripts/files/elements/ubuntu-redis/install.d/10-redis rename to integration/scripts/files/elements/ubuntu-redis/install.d/30-redis index 57fcdf9035..6930f5198d 100755 --- a/integration/scripts/files/elements/ubuntu-redis/install.d/10-redis +++ b/integration/scripts/files/elements/ubuntu-redis/install.d/30-redis @@ -45,9 +45,9 @@ ULIMIT=65536 _EOF_ # Install Python driver for Redis ('redis-py'). -pip install redis +pip2 install redis # By default, redis-py will attempt to use the HiredisParser if installed. # Using Hiredis can provide up to a 10x speed improvement in parsing responses # from the Redis server. -pip install hiredis +pip2 install hiredis diff --git a/integration/scripts/files/elements/ubuntu-xenial-postgresql/install.d/11-fix-init-script b/integration/scripts/files/elements/ubuntu-xenial-postgresql/install.d/31-fix-init-script similarity index 100% rename from integration/scripts/files/elements/ubuntu-xenial-postgresql/install.d/11-fix-init-script rename to integration/scripts/files/elements/ubuntu-xenial-postgresql/install.d/31-fix-init-script diff --git a/integration/scripts/files/elements/ubuntu-xenial-redis/install.d/11-fix-init-file b/integration/scripts/files/elements/ubuntu-xenial-redis/install.d/31-fix-init-file similarity index 100% rename from integration/scripts/files/elements/ubuntu-xenial-redis/install.d/11-fix-init-file rename to integration/scripts/files/elements/ubuntu-xenial-redis/install.d/31-fix-init-file