diff options
author | Morgan Richomme <morgan.richomme@orange.com> | 2015-10-29 16:55:28 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2015-10-29 16:55:28 +0000 |
commit | d8d56ee6fe890707b66f07db640c26212e42149f (patch) | |
tree | f2bd0b2ee0208b725ccfe39833b6ba54a78c8562 | |
parent | 34fb580d2a2df0a3e41bc45865a6dfb35bdc9244 (diff) | |
parent | 2378ab6dbf2bc2a1e01593498dd7cb9cd8dfbd6c (diff) |
Merge "Fix so that given config_functest.yaml is copied to functest repo dir"
-rwxr-xr-x | docker/prepare_env.sh | 13 |
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} |