From 00b51ffe114702ce207aa7ba2e40f01984c0c57c Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Wed, 13 Jan 2016 11:35:59 +0100
Subject: 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>
---
 docker/common.sh      |  5 ++++-
 docker/prepare_env.sh | 13 -------------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'docker')

diff --git a/docker/common.sh b/docker/common.sh
index aabc32cb..eccdc252 100755
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -22,9 +22,12 @@
 #
 config_file=/home/opnfv/functest/conf/config_functest.yaml
 if [ ! -f ${config_file} ]; then
-    config_file=$(find / -name config_functest.yaml)
+    default_config_file=$(find /home/opnfv/repos -name config_functest.yaml)
+    cp $default_config_file $config_file
+    echo "config_functest.yaml not provided. Using default one"
 fi
 
+
 # Parse config_functest.yaml file
 # TODO: this is not the best way to parse a yaml file in bash...
 
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 1db7be38..4bb1785e 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}
-- 
cgit 1.2.3-korg