Fix array of test in run_tests.sh

[functest.git] / docker / prepare_env.sh

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index cae53b7..48320d4 100755 (executable)
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -57,7 +57,7 @@ else
 fi
 
 # definition of available installer names
-INSTALLERS=(fuel foreman compass apex joid)
+INSTALLERS=(fuel compass apex joid)
 
 if [ ! -f ${FUNCTEST_CONF_DIR}/openstack.creds ]; then
     # If credentials file is not given, check if environment variables are set
@@ -80,20 +80,6 @@ fi
 
 if [ $offline == false ]; then
     # Update repos
-    info "Updating Functest repository...."
-    cd ${FUNCTEST_REPO_DIR}
-    if [ ${FUNCTEST_BRANCH} != "master" ]; then
-        info "Functest repo: checkout ${FUNCTEST_BRANCH} branch..."
-        git checkout ${FUNCTEST_BRANCH}
-    fi
-    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
@@ -156,6 +142,19 @@ if [ $offline == false ]; then
         git reset --hard ${ONOS_COMMIT}
     fi
 
+    info "Updating PROMISE repository...."
+    cd ${PROMISE_REPO_DIR}
+    if [ ${PROMISE_BRANCH} != "master" ]; then
+        info "PROMISE repo: checkout ${PROMISE} branch..."
+        git checkout ${PROMISE_BRANCH}
+    fi
+    info "PROMISE repo: pulling to latest..."
+    git pull
+    if [ ${PROMISE_COMMIT} != "latest" ]; then
+        info "PROMISE repo: given commit is ${PROMISE_COMMIT}. Reseting..."
+        git reset --hard ${PROMISE_COMMIT}
+    fi
+
 fi
 
 # We do this regardless if its online or offline mode.
@@ -166,19 +165,6 @@ if [ ${RALLY_COMMIT} != "latest" ]; then
     git reset --hard ${RALLY_COMMIT}
 fi
 
-# Ugly hack:
-# After the 'git functest pull', we move the given yaml file to the repo directory,
-# since some of the scripts will use that one, and not the one in
-# /home/opnfv/functest/conf/
-given_config_file=/home/opnfv/functest/conf/config_functest.yaml
-default_config_file=$(find /home/opnfv/repos -name config_functest.yaml)
-if [ -f ${given_config_file} ]; then
-    info "Copying given config_functest.yaml to the repository directory"
-    cp ${given_config_file} ${default_config_file}
-else
-    info "config_functest.yaml not provided. Using default one: ${default_config_file}"
-fi
-
 
 # Create directories
 mkdir -p ${FUNCTEST_CONF_DIR}
@@ -219,4 +205,6 @@ if [ $retval != 0 ]; then
     exit $retval
 fi
 
+ifconfig eth0 mtu 1450
+
 echo "1" > ${FUNCTEST_CONF_DIR}/env_active