summaryrefslogtreecommitdiffstats
path: root/docker/prepare_env.sh
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-01-13 11:35:59 +0100
committerjose.lausuch <jose.lausuch@ericsson.com>2016-01-13 11:38:45 +0100
commit00b51ffe114702ce207aa7ba2e40f01984c0c57c (patch)
treea5b7f6a440259832b7fe0dc0f1a8a6b2693f682c /docker/prepare_env.sh
parent870587bd57ed00fb1b172ee9848f7cdfb3d04270 (diff)
Place config_functest.yaml outside the functest repo
If config_functest.yaml is given it will be placed in: /home/opnfv/functest/conf/config_functest.yaml If not given: copy default from repo to that location Change-Id: I816bf5ccf8e0a5b8ebde2a0ab924657533f49127 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'docker/prepare_env.sh')
-rwxr-xr-xdocker/prepare_env.sh13
1 files changed, 0 insertions, 13 deletions
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 1db7be382..4bb1785ec 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -179,19 +179,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}