diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2017-02-16 16:35:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-16 16:35:21 +0000 |
| commit | ba1f2ace691c0564965770855b1128eec2f0cb9b (patch) | |
| tree | 1acd0c279adc42a6c1554624d84a764bda5af23f | |
| parent | a4a8e7598a82189d16f68a4e113447fc344464c7 (diff) | |
| parent | 6ff21abfc08f0fe94ac7cb3dc22834a9b4c305ad (diff) | |
Merge "ci: Add SRIOV TC to CI daily job"
| -rwxr-xr-x | ci/build-vsperf.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh index 7771a568..b4a0f24b 100755 --- a/ci/build-vsperf.sh +++ b/ci/build-vsperf.sh @@ -51,6 +51,8 @@ TESTPARAM_MERGE="--integration" # DAILY - run selected TCs for defined packet sizes TESTCASES_DAILY='phy2phy_tput back2back phy2phy_tput_mod_vlan phy2phy_scalability pvp_tput pvp_back2back pvvp_tput pvvp_back2back' TESTPARAM_DAILY='--test-params TRAFFICGEN_PKT_SIZES=(64,128,512,1024,1518)' +TESTCASES_SRIOV='pvp_tput' +TESTPARAM_SRIOV='--test-params TRAFFICGEN_PKT_SIZES=(64,128,512,1024,1518)' # check if user config file exists if not then we will use default settings if [ -f $HOME/vsperf-${BRANCH}.conf ] ; then # branch specific config was found @@ -62,6 +64,12 @@ else CONF_FILE="" fi fi +# check if sriov specific config file exists if not then use default configuration +if [ -f $HOME/vsperf-${BRANCH}.conf.sriov ] ; then + CONF_FILE_SRIOV="${CONF_FILE}.sriov" +else + CONF_FILE_SRIOV=$CONF_FILE +fi # Test report related configuration TEST_REPORT_PARTIAL="*_test_report.rst" @@ -158,6 +166,17 @@ function execute_vsperf() { DATE_SUFFIX=$(date -u +"%Y-%m-%d_%H-%M-%S") case $1 in + "SRIOV") + # use SRIOV specific TCs and configuration + TESTPARAM=$TESTPARAM_SRIOV + TESTCASES=$TESTCASES_SRIOV + # figure out log file name + LOG_SUBDIR="SRIOV" + LOG_FILE="${LOG_FILE_PREFIX}_${LOG_SUBDIR}_${DATE_SUFFIX}.log" + + echo " $VSPERF_BIN --vswitch none --vnf QemuPciPassthrough $CONF_FILE_SRIOV $TESTPARAM $TESTCASES &> $LOG_FILE" + $VSPERF_BIN --vswitch none --vnf QemuPciPassthrough $CONF_FILE_SRIOV $TESTPARAM $TESTCASES &> $LOG_FILE + ;; "OVS_vanilla") # figure out log file name LOG_SUBDIR="OvsVanilla" @@ -439,6 +458,8 @@ case $1 in terminate_vsperf execute_vsperf OVS_vanilla $1 terminate_vsperf + execute_vsperf SRIOV $1 + terminate_vsperf generate_report |