diff options
Diffstat (limited to 'docker/prepare_env.sh')
| -rwxr-xr-x | docker/prepare_env.sh | 15 |
1 files changed, 1 insertions, 14 deletions
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} |