aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdocker/prepare_env.sh13
-rwxr-xr-xdocker/run_tests.sh2
2 files changed, 14 insertions, 1 deletions
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 454ba4e3b..f3e31d926 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -133,6 +133,19 @@ 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}
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 2a523ed3d..e428da7ed 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -28,7 +28,7 @@ examples:
# Support for Functest offline
# NOTE: Still not 100% working when running the tests
offline=false
-arr_test=(vping odl rally tempest vims)
+arr_test=(vping odl tempest vims rally)
function run_test(){