diff options
Diffstat (limited to 'bootstrap-verify-perf.sh')
| -rwxr-xr-x | bootstrap-verify-perf.sh | 73 |
1 files changed, 45 insertions, 28 deletions
diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 98855a7be1..4177625726 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -65,7 +65,7 @@ then VPP_DEBS="$( readlink -f *.deb | tr '\n' ' ' )" fi - cd .. + cd ${SCRIPT_DIR} # If we run this script from vpp project we want to use local build elif [[ ${JOB_NAME} == vpp-* ]] ; @@ -124,9 +124,8 @@ function cancel_all { # packages trap "cancel_all ${WORKING_TOPOLOGY}" EXIT -python ${SCRIPT_DIR}/resources/tools/scripts/topo_installation.py -t ${WORKING_TOPOLOGY} \ - -d ${INSTALLATION_DIR} \ - -p ${VPP_DEBS} +python ${SCRIPT_DIR}/resources/tools/scripts/topo_installation.py \ + -t ${WORKING_TOPOLOGY} -d ${INSTALLATION_DIR} -p ${VPP_DEBS} if [ $? -eq 0 ]; then echo "VPP Installed on hosts from: ${WORKING_TOPOLOGY}" else @@ -134,12 +133,30 @@ else exit 1 fi +# Based on job we will identify DUT +if [[ ${JOB_NAME} == *hc2vpp* ]] ; +then + DUT="hc2vpp" +elif [[ ${JOB_NAME} == *vpp* ]] ; +then + DUT="vpp" +elif [[ ${JOB_NAME} == *ligato* ]] ; +then + DUT="kubernetes" +elif [[ ${JOB_NAME} == *dpdk* ]] ; +then + DUT="dpdk" +else + echo "Unable to identify dut type based on JOB_NAME variable: ${JOB_NAME}" + exit 1 +fi + case "$TEST_TAG" in # run specific performance tests based on jenkins job type variable PERFTEST_DAILY ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cORndrdiscANDnic_intel-x520-da2AND2t2c \ --include ndrdiscAND1t1cANDipsecORndrdiscAND2t2cANDipsec \ tests/ @@ -148,7 +165,7 @@ case "$TEST_TAG" in PERFTEST_SEMI_WEEKLY ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -156,7 +173,7 @@ case "$TEST_TAG" in PERFTEST_MRR_DAILY ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include mrrAND64bAND1t1c \ --include mrrAND64bAND2t2c \ --include mrrAND64bAND4t4c \ @@ -175,7 +192,7 @@ case "$TEST_TAG" in VERIFY-PERF-NDRDISC ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscAND1t1cORndrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -183,7 +200,7 @@ case "$TEST_TAG" in VERIFY-PERF-PDRDISC ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include pdrdiscAND1t1cORpdrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -191,7 +208,7 @@ case "$TEST_TAG" in VERIFY-PERF-MRR ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include mrrAND1t1cORmrrAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -199,7 +216,7 @@ case "$TEST_TAG" in VERIFY-PERF-IP4 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip4baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -207,7 +224,7 @@ case "$TEST_TAG" in VERIFY-PERF-IP6 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip6baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -215,7 +232,7 @@ case "$TEST_TAG" in VERIFY-PERF-L2 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDl2xcbaseORndrdiscANDnic_intel-x520-da2AND1t1cANDl2bdbase \ tests/ RETURN_STATUS=$(echo $?) @@ -223,7 +240,7 @@ case "$TEST_TAG" in VERIFY-PERF-LISP ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDlisp \ tests/ RETURN_STATUS=$(echo $?) @@ -231,7 +248,7 @@ case "$TEST_TAG" in VERIFY-PERF-VXLAN ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvxlan \ tests/ RETURN_STATUS=$(echo $?) @@ -239,7 +256,7 @@ case "$TEST_TAG" in VERIFY-PERF-VHOST ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ tests/ RETURN_STATUS=$(echo $?) @@ -247,7 +264,7 @@ case "$TEST_TAG" in VERIFY-PERF-MEMIF ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDmemif \ tests/ RETURN_STATUS=$(echo $?) @@ -255,7 +272,7 @@ case "$TEST_TAG" in VERIFY-PERF-IPSECHW ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf.crypto" \ + -s "tests.${DUT}.perf.crypto" \ --include ndrdiscANDnic_intel-xl710AND1t1cANDipsechw \ --include ndrdiscANDnic_intel-xl710AND2t2cANDipsechw \ --include mrrANDnic_intel-xl710AND1t1cANDipsechw \ @@ -266,7 +283,7 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-IP4 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include mrrANDnic_intel-x520-da2AND1t1cANDip4baseORmrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -274,7 +291,7 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-IP6 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include mrrANDnic_intel-x520-da2AND1t1cANDip6baseORmrrANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -282,7 +299,7 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-L2 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include mrrANDnic_intel-x520-da2AND1t1cANDl2xcbaseORmrrANDnic_intel-x520-da2AND1t1cANDl2bdbase \ tests/ RETURN_STATUS=$(echo $?) @@ -290,7 +307,7 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-LISP ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDlisp \ tests/ RETURN_STATUS=$(echo $?) @@ -298,7 +315,7 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-VXLAN ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDvxlan \ tests/ RETURN_STATUS=$(echo $?) @@ -306,7 +323,7 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-VHOST ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ tests/ RETURN_STATUS=$(echo $?) @@ -314,7 +331,7 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-MEMIF ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif \ --include pdrdiscANDnic_intel-x520-da2AND2t2cANDmemif \ --include mrrANDnic_intel-x520-da2AND1t1cANDmemif \ @@ -325,7 +342,7 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-ACL ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ --include pdrdiscANDnic_intel-x520-da2AND1t1cANDacl \ --include pdrdiscANDnic_intel-x520-da2AND2t2cANDacl \ tests/ @@ -334,7 +351,7 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-IPSECHW ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf.crypto" \ + -s "tests.${DUT}.perf.crypto" \ --include pdrdiscANDnic_intel-xl710AND1t1cANDipsechw \ --include pdrdiscANDnic_intel-xl710AND2t2cANDipsechw \ --include mrrANDnic_intel-xl710AND1t1cANDipsechw \ @@ -346,7 +363,7 @@ case "$TEST_TAG" in # run full performance test suite and exit on fail pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ + -s "tests.${DUT}.perf" \ tests/ RETURN_STATUS=$(echo $?) esac |