From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Wed, 28 Oct 2015 15:41:17 +0000 (+0100)
Subject: Added reset to rally commit ID in prepare_env.sh
X-Git-Tag: brahmaputra.1.0~294
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b39289732672b60e7e76cf22f79c4586e2ab87b1;p=functest.git

Added reset to rally commit ID in prepare_env.sh

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

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 6c77e8140..493f2f88a 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -102,8 +102,16 @@ if [ $offline == false ]; then
 
     info "Updating Rally repository...."
     cd ${RALLY_REPO_DIR}
+    if [ ${RALLY_BRANCH} != "master" ]; then
+        info "Rally repo: checkout ${RALLY_BRANCH} branch..."
+        git checkout ${RALLY_BRANCH}
+    fi
     info "Rally repo: pulling to latest..."
     git pull
+    if [ ${RALLY_COMMIT} != "latest" ]; then
+        info "Rally repo: given commit is ${RALLY_COMMIT}. Reseting..."
+        git reset --hard ${RALLY_COMMIT}
+    fi
 
     info "Updating vIMS test repository...."
     cd ${VIMS_REPO_DIR}