From 2378ab6dbf2bc2a1e01593498dd7cb9cd8dfbd6c Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Thu, 29 Oct 2015 17:41:21 +0100 Subject: Fix so that given config_functest.yaml is copied to functest repo dir Change-Id: I985d7d7c1d1cba17e5ebc76514a82a15f682b26f Signed-off-by: jose.lausuch --- docker/prepare_env.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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} -- cgit 1.2.3-korg