aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-01-13 10:52:06 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-13 10:52:06 +0000
commit5654af97aa383050dfa358cc9bb6e6d4d8d060c7 (patch)
tree75d8d3d3dfe515c90525180f31641c27c7fb58c8 /docker
parent0f9250f654be1e2ced4b6d640ec13e7e78db39ee (diff)
parent00b51ffe114702ce207aa7ba2e40f01984c0c57c (diff)
Merge "Place config_functest.yaml outside the functest repo"
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/common.sh5
-rwxr-xr-xdocker/prepare_env.sh13
2 files changed, 4 insertions, 14 deletions
diff --git a/docker/common.sh b/docker/common.sh
index aabc32cbe..eccdc252a 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 a56c580bb..cf407499f 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}