diff options
Diffstat (limited to 'ci/build-vsperf.sh')
| -rwxr-xr-x | ci/build-vsperf.sh | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh index 00a548ba..a5ee8501 100755 --- a/ci/build-vsperf.sh +++ b/ci/build-vsperf.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2015-2017 Intel Corporation. +# Copyright 2015-2018 Intel Corporation., Tieto # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -44,9 +44,9 @@ RESULTS_ARCHIVE="$HOME/ci_results_archive" # CI job specific configuration # VERIFY - run basic set of TCs with default settings -TESTCASES_VERIFY="vswitch_add_del_bridge vswitch_add_del_bridges vswitch_add_del_vport vswitch_add_del_vports vswitch_vports_add_del_flow" +TESTCASES_VERIFY="vswitch_add_del_bridge vswitch_add_del_bridges vswitch_add_del_vport vswitch_add_del_vports vswitch_vports_add_del_connection" TESTPARAM_VERIFY="--integration" -TESTCASES_VERIFY_VPP="vswitch_add_del_bridge vswitch_add_del_bridges vswitch_add_del_vport vswitch_add_del_vports vswitch_vports_add_del_connection_vpp" +TESTCASES_VERIFY_VPP=$TESTCASES_VERIFY TESTPARAM_VERIFY_VPP=$TESTPARAM_VERIFY # MERGE - run selected TCs with default settings TESTCASES_MERGE=$TESTCASES_VERIFY @@ -137,7 +137,7 @@ function print_results() { printf " %-70s %-6s\n" "result_${i}" "FAILED" EXIT=$EXIT_TC_FAILED else - RES_FILE=`ls -1 $1 | egrep "result_${i}_[0-9a-zA-Z\-]+.csv"` + RES_FILE=`ls -1 $1 | egrep "result_[0-9]+_${i}_[0-9a-zA-Z\-]+.csv"` if [ "x$RES_FILE" != "x" -a -e "${1}/${RES_FILE}" ]; then if grep ^FAILED "${1}/${RES_FILE}" &> /dev/null ; then @@ -433,15 +433,6 @@ function dependencies_check() { sudo apt-get install -y $PACKAGE fi done - # install additional python packages into python environment - for PACKAGE in "pylint" ; do - if pip show $PACKAGE &> /dev/null ; then - printf " %-70s %-6s\n" $PACKAGE "OK" - else - printf " %-70s %-6s\n" $PACKAGE "missing" - pip install $PACKAGE - fi - done echo fi } @@ -535,7 +526,7 @@ case $1 in echo "VSPERF merge job" echo "================" - execute_pylint_check + execute_vsperf_pylint_check terminate_vsperf execute_vsperf_sanity terminate_vsperf |