diff options
| -rwxr-xr-x | ci/build-vsperf.sh | 15 | ||||
| -rw-r--r-- | conf/integration/01_testcases.conf | 11 |
2 files changed, 26 insertions, 0 deletions
diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh index a8a42cee..755fb51a 100755 --- a/ci/build-vsperf.sh +++ b/ci/build-vsperf.sh @@ -213,6 +213,21 @@ function execute_vsperf() { LOG_FILE="${LOG_FILE_PREFIX}_${LOG_SUBDIR}_${DATE_SUFFIX}.log" hugepages_info > $LOG_FILE + + # check if VPP is up & running + echo " $VSPERF_BIN $OPNFVPOD --vswitch VppDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM vswitch_version_vpp >> ${LOG_FILE}2" + $VSPERF_BIN $OPNFVPOD --vswitch VppDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM vswitch_version_vpp &>> ${LOG_FILE}2 + if (grep FAILED ${LOG_FILE}2 &> /dev/null ) ; then + # VPP can't be executed or vppctl can't connect to it, so skip + # VPP tests as it is probably an issue with jenkins slave + printf " %-70s %-6s\n" "vswitch_version_vpp" "FAILED" + echo + echo "VPP is not working properly. VPP tests will be skipped." + echo + return + else + printf " %-70s %-6s\n" "vswitch_version_vpp" "OK" + fi echo " $VSPERF_BIN $OPNFVPOD --vswitch VppDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM $TESTCASES > $LOG_FILE" $VSPERF_BIN $OPNFVPOD --vswitch VppDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM $TESTCASES &>> $LOG_FILE hugepages_info >> $LOG_FILE diff --git a/conf/integration/01_testcases.conf b/conf/integration/01_testcases.conf index 647e39cc..dfc8a4c2 100644 --- a/conf/integration/01_testcases.conf +++ b/conf/integration/01_testcases.conf @@ -970,9 +970,20 @@ INTEGRATION_TESTS = [ # VPP tests used by VERIFY and MERGE jobs by OPNFV Jenkins # { + "Name": "vswitch_version_vpp", + "Deployment": "clean", + "Description": "VPP: vSwitch - determine VPP version and fail if it is not possible.", + "vSwitch" : "VppDpdkVhost", + "TestSteps": [ + ['vswitch', 'run_vppctl', ['show', 'version', 'verbose'], '|Version:\s+(v\d+\.\d+)'], + ['tools', 'assert', 'len(#STEP[-1][0])'], + ] + }, + { "Name": "vswitch_vports_add_del_connection_vpp", "Deployment": "clean", "Description": "VPP: vSwitch - configure switch with vports, add and delete connection", + "vSwitch" : "VppDpdkVhost", "TestSteps": [ ['vswitch', 'add_switch', 'int_br0'], ['vswitch', 'add_vport', 'int_br0'], |