diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/common.sh | 6 | ||||
| -rwxr-xr-x | docker/prepare_env.sh | 15 |
3 files changed, 7 insertions, 16 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 6ae06e235..a39775c81 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,7 +10,7 @@ # # Execution: # $ docker run -t -i \ -# -e "INSTALLER_TYPE=fuel/foreman" \ +# -e "INSTALLER_TYPE=fuel|apex|compass|joid \ # -e "INSTALLER_IP=10.20.0.2/172.30.10.73" \ # -v $(pwd)/config_functest.yaml:/home/opnfv/functest/conf/config_functest.yaml # opnfv/functest /bin/bash diff --git a/docker/common.sh b/docker/common.sh index aabc32cbe..f21263c7e 100755 --- a/docker/common.sh +++ b/docker/common.sh @@ -20,11 +20,15 @@ # # If it is not provided, take the existing one in the functest repo # +mkdir -p /home/opnfv/functest/conf 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 1db7be382..cf407499f 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -57,7 +57,7 @@ else fi # definition of available installer names -INSTALLERS=(fuel foreman compass apex joid) +INSTALLERS=(fuel compass apex joid) if [ ! -f ${FUNCTEST_CONF_DIR}/openstack.creds ]; then # If credentials file is not given, check if environment variables are set @@ -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} |