diff options
author | jose.lausuch <jose.lausuch@ericsson.com> | 2016-05-04 11:47:40 +0200 |
---|---|---|
committer | jose.lausuch <jose.lausuch@ericsson.com> | 2016-05-04 14:35:07 +0200 |
commit | 6790e17eb7c1a3eaaccfe97ac90932e3c15eea6d (patch) | |
tree | 06697206e1323dd3acdce742a2e1e5d5bb4b232f /docker/common.sh | |
parent | 7ad2ce42a2bc2c8dc17fbc9423da71a95fed4d87 (diff) |
Refactor improvements
JIRA: FUNCTEST-190
- Deleted unnecessary old scripts
- Fixed healtcheck logging
- Moved config_functest.yaml to /ci/
- Created env var CONFIG_FUNCTEST_YAML pointing to that new location
- Modified all scripts which open config_functest.yaml using the new env var
Change-Id: Ic4f0e40a70c02ac08287a1d621956f602bdee177
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'docker/common.sh')
-rwxr-xr-x | docker/common.sh | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/docker/common.sh b/docker/common.sh deleted file mode 100755 index b81dedf7..00000000 --- a/docker/common.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -# -# Author: Jose Lausuch (jose.lausuch@ericsson.com) -# -# Installs the Functest framework within the Docker container -# and run the tests automatically -# -# If config_functest.yaml is given by the docker run command, -# it must be run like this: -# -# docker run -ti \ -# -e "INSTALLER_TYPE=<something>" \ -# -e "INSTALLER_IP=<ip>" \ -# -v $(pwd)/config_functest.yaml:/home/opnfv/functest/conf/config_functest.yaml \ -# opnfv/functest /bin/bash -# -# NOTE: $(pwd)/config_functest.yaml means that it will take the one in the -# current directory. -# -# If it is not provided, take the existing one in the functest repo -# - -# this pull is to be removed right before the B release, once we build -# a release candidate docker -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -# - -mkdir -p /home/opnfv/functest/conf -config_file=/home/opnfv/functest/conf/config_functest.yaml -if [ ! -f ${config_file} ]; then - 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... - -# Directories -REPOS_DIR=$(cat $config_file | grep -w dir_repos | awk 'END {print $NF}') -FUNCTEST_REPO_DIR=$(cat $config_file | grep -w dir_repo_functest | awk 'END {print $NF}') -FUNCTEST_DIR=$(cat $config_file | grep -w dir_functest | awk 'END {print $NF}') -FUNCTEST_RESULTS_DIR=$(cat $config_file | grep -w dir_results | awk 'END {print $NF}') -FUNCTEST_CONF_DIR=$(cat $config_file | grep -w dir_functest_conf | awk 'END {print $NF}') -FUNCTEST_DATA_DIR=$(cat $config_file | grep -w dir_functest_data | awk 'END {print $NF}') -RALLY_VENV_DIR=$(cat $config_file | grep -w dir_rally_inst | awk 'END {print $NF}') - - -info () { - logger -s -t "FUNCTEST.info" "$*" -} - -error () { - logger -s -t "FUNCTEST.error" "$*" - exit 1 -} |