Merge "Add support for SSL endpoints in Functest"

[functest.git] / docker / prepare_env.sh

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 4106e3b..542df0e 100755 (executable)
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -174,6 +174,18 @@ if [ $offline == false ]; then
         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.
@@ -221,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
@@ -229,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