aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2015-10-29 17:41:21 +0100
committerjose.lausuch <jose.lausuch@ericsson.com>2015-10-29 17:44:55 +0100
commit2378ab6dbf2bc2a1e01593498dd7cb9cd8dfbd6c (patch)
tree8dd3d929329f9212e7a744057f0e479c3006e3f1
parent291f7804f4a89946aee961b4bed43fa91b4a3c1f (diff)
Fix so that given config_functest.yaml is copied to functest repo dir
Change-Id: I985d7d7c1d1cba17e5ebc76514a82a15f682b26f Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
-rwxr-xr-xdocker/prepare_env.sh13
1 files changed, 13 insertions, 0 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}