diff options
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 17 | ||||
| -rw-r--r-- | modules/opnfv/utils/ovs_logger.py | 19 | ||||
| -rw-r--r-- | utils/test/reporting/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | utils/test/reporting/docker/reporting.sh | 2 | ||||
| -rw-r--r-- | utils/test/reporting/html/euphrates.html | 2 | ||||
| -rw-r--r-- | utils/test/reporting/reporting/yardstick/scenarios.py | 2 |
6 files changed, 28 insertions, 16 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 8ede529a1..ffd86f876 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -5,8 +5,9 @@ set +u set +o pipefail run_tiers() { - cmd_opt='prepare_env start && run_tests -r -t all' - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt='prepare_env start && run_tests -t all' + tiers=$1 + cmd_opt="prepare_env start && run_tests -r -t all" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -19,15 +20,19 @@ run_tiers() { eval ${cmd} ret_value=$? if [ ${ret_value} != 0 ]; then - echo ${ret_value} > ${ret_val_file} + echo ${ret_value} > ${ret_val_file} + if [ ${tier} == 'healthcheck' ]; then + echo "Healthcheck tier failed. Exiting Functest..." + exit 1 + fi fi done } run_test() { test_name=$1 - cmd_opt='prepare_env start && run_tests -r -t $test_name' - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt='prepare_env start && run_tests -t $test_name' + cmd_opt="prepare_env start && run_tests -r -t ${test_name}" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t ${test_name}" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} # Determine which Functest image should be used for the test case @@ -42,7 +47,7 @@ run_test() { FUNCTEST_IMAGE=opnfv/functest-vnf ;; promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd) FUNCTEST_IMAGE=opnfv/functest-features ;; - parser) + parser-basics) FUNCTEST_IMAGE=opnfv/functest-parser ;; *) echo "Unkown test case $test_name" diff --git a/modules/opnfv/utils/ovs_logger.py b/modules/opnfv/utils/ovs_logger.py index 7777a9a16..eb070e3bd 100644 --- a/modules/opnfv/utils/ovs_logger.py +++ b/modules/opnfv/utils/ovs_logger.py @@ -27,11 +27,10 @@ class OVSLogger(object): if not os.path.exists(dirpath): os.makedirs(dirpath) - def __ssh_host(self, ssh_conn, host_prefix='10.20.0'): + def __ssh_host(self, ssh_conn): try: - _, stdout, _ = ssh_conn.exec_command('hostname -I') - hosts = stdout.readline().strip().split(' ') - found_host = [h for h in hosts if h.startswith(host_prefix)][0] + _, stdout, _ = ssh_conn.exec_command('hostname') + found_host = stdout.readline() return found_host except Exception as e: logger.error(e) @@ -98,10 +97,18 @@ class OVSLogger(object): def dump_ovs_logs(self, controller_clients, compute_clients, related_error=None, timestamp=None): + """ + delete controller_clients argument because + that was producing an error in XCI installer. + + For more information see: + TODO: https://jira.opnfv.org/browse/RELENG-314 + """ + del controller_clients if timestamp is None: timestamp = time.strftime("%Y%m%d-%H%M%S") - - clients = controller_clients + compute_clients + # clients = controller_clients + compute_clients + clients = compute_clients for client in clients: self.ofctl_dump_flows(client, timestamp=timestamp) self.vsctl_show(client, timestamp=timestamp) diff --git a/utils/test/reporting/docker/Dockerfile b/utils/test/reporting/docker/Dockerfile index f2357909d..07440ad29 100644 --- a/utils/test/reporting/docker/Dockerfile +++ b/utils/test/reporting/docker/Dockerfile @@ -22,7 +22,7 @@ ARG BRANCH=master ENV HOME /home/opnfv ENV working_dir ${HOME}/releng/utils/test/reporting -ENV CONFIG_REPORTING_YAML ${working_dir}/reporting.yaml +ENV CONFIG_REPORTING_YAML ${working_dir}/reporting/reporting.yaml WORKDIR ${HOME} # Packaged dependencies diff --git a/utils/test/reporting/docker/reporting.sh b/utils/test/reporting/docker/reporting.sh index 6cc7a7c9e..25d3ef117 100755 --- a/utils/test/reporting/docker/reporting.sh +++ b/utils/test/reporting/docker/reporting.sh @@ -3,7 +3,7 @@ export PYTHONPATH="${PYTHONPATH}:./reporting" export CONFIG_REPORTING_YAML=./reporting/reporting.yaml -declare -a versions=(danube master) +declare -a versions=(euphrates danube master) declare -a projects=(functest storperf yardstick qtip vsperf bottlenecks) project=$1 diff --git a/utils/test/reporting/html/euphrates.html b/utils/test/reporting/html/euphrates.html index 86258ac23..ff7061b4a 100644 --- a/utils/test/reporting/html/euphrates.html +++ b/utils/test/reporting/html/euphrates.html @@ -35,7 +35,7 @@ <div id="main"> <div class="inner"> <header> - <h1>Danube reporting</h1> + <h1>Euphrates reporting</h1> </header> <section class="tiles"> <article class="style3"> diff --git a/utils/test/reporting/reporting/yardstick/scenarios.py b/utils/test/reporting/reporting/yardstick/scenarios.py index 26e8c8bb0..7504493b2 100644 --- a/utils/test/reporting/reporting/yardstick/scenarios.py +++ b/utils/test/reporting/reporting/yardstick/scenarios.py @@ -9,7 +9,7 @@ import requests import yaml -import utils.reporting_utils as rp_utils +import reporting.utils.reporting_utils as rp_utils yardstick_conf = rp_utils.get_config('yardstick.test_conf') response = requests.get(yardstick_conf) |