X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fprepare_env.sh;h=542df0e72aa4ad81b71d13ea8fb389e705f7aecd;hb=3b70767b85152cc79381104ba73c0afe9607f781;hp=ec14391c0632b309cdce097575a50b5fc3ed944b;hpb=5c35c622d11f309f8e1f7eddf5f50112fc3b7298;p=functest.git

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index ec14391c0..542df0e72 100755
--- 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.
 
@@ -80,16 +86,6 @@ fi
 
 if [ $offline == false ]; then
     # Update repos
-    info "Updating Functest repository...."
-    cd ${FUNCTEST_REPO_DIR}
-    info "Functest repo: pulling to latest..."
-    git pull
-    if [ ${FUNCTEST_COMMIT} != "latest" ]; then
-        info "Functest repo: given commit is ${FUNCTEST_COMMIT}. Reseting..."
-        git reset --hard ${FUNCTEST_COMMIT}
-    fi
-    source ${BASEDIR}/common.sh
-
     info "Updating Releng repository...."
     cd ${RELENG_REPO_DIR}
     if [ ${RELENG_BRANCH} != "master" ]; then
@@ -165,6 +161,31 @@ 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
+
+    info "Updating DOCTOR repository...."
+    cd ${DOCTOR_REPO_DIR}
+    if [ ${DOCTOR_BRANCH} != "master" ]; then
+        info "DOCTOR repo: checkout ${DOCTOR} branch..."
+        git checkout ${DOCTOR_BRANCH}
+    fi
+    info "DOCTOR repo: pulling to latest..."
+    git pull
+    if [ ${DOCTOR_COMMIT} != "latest" ]; then
+        info "DOCTOR repo: given commit is ${DOCTOR_COMMIT}. Reseting..."
+        git reset --hard ${DOCTOR_COMMIT}
+    fi
 fi
 
 # We do this regardless if its online or offline mode.
@@ -175,6 +196,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}
@@ -207,7 +233,7 @@ if [ $RETVAL -ne 0 ]; then
 fi
 
 # Prepare Functest Environment
-info "Functest: prepare Functest environment"
+info "Preparing Functest environment..."
 python ${FUNCTEST_REPO_DIR}/testcases/config_functest.py --debug start
 retval=$?
 if [ $retval != 0 ]; then
@@ -215,6 +241,12 @@ if [ $retval != 0 ]; then
     exit $retval
 fi
 
+
+# Generate OpenStack defaults
+info "Generating OpenStack defaults..."
+python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py -d
+
+
 ifconfig eth0 mtu 1450
 
 echo "1" > ${FUNCTEST_CONF_DIR}/env_active