Merge "Add control to redirect rally stderr"

[functest.git] / docker / prepare_env.sh

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 48320d4..4106e3b 100755 (executable)
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -6,6 +6,12 @@
 # Installs the Functest framework within the Docker container
 # and run the tests automatically
 #
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
 
 usage="Script to prepare the Functest environment.
 
@@ -155,6 +161,19 @@ if [ $offline == false ]; then
         git reset --hard ${PROMISE_COMMIT}
     fi
 
+    info "Updating OVNO repository...."
+    cd ${OVNO_REPO_DIR}
+    if [ ${OVNO_BRANCH} != "master" ]; then
+        info "OVNO repo: checkout ${OVNO} branch..."
+        git checkout ${OVNO_BRANCH}
+    fi
+    info "OVNO repo: pulling to latest..."
+    git pull
+    if [ ${OVNO_COMMIT} != "latest" ]; then
+        info "OVNO repo: given commit is ${OVNO_COMMIT}. Reseting..."
+        git reset --hard ${OVNO_COMMIT}
+    fi
+
 fi
 
 # We do this regardless if its online or offline mode.
@@ -165,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}