From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Thu, 21 Jan 2016 09:12:44 +0000 (+0100)
Subject: Temp solution to workaround the problem with pip when installing tempest
X-Git-Tag: colorado.1.0~612
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b9ef32116182fbe7f5f0d75422fa440c78c962fc;p=functest.git

Temp solution to workaround the problem with pip when installing tempest

Change-Id: If9c44fedd3e21a77d7ba434f794db24e16fc4ff1
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 4f1751baa..4106e3bde 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -184,6 +184,11 @@ if [ ${RALLY_COMMIT} != "latest" ]; then
     git reset --hard ${RALLY_COMMIT}
 fi
 
+# IMPORTANT: To be removed when version 0.2.1 is out
+git config --global user.email "functest@opnfv.com"
+git config --global user.name "opnfv/functest"
+git fetch https://review.openstack.org/openstack/rally refs/changes/06/270506/9 && git cherry-pick FETCH_HEAD
+
 
 # Create directories
 mkdir -p ${FUNCTEST_CONF_DIR}