From 7a52c16bc35b6abfd0cfacbc6be79b38ee467367 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Wed, 19 Apr 2017 15:29:51 +0200 Subject: [PATCH] CSIT-557: Performance jobs reorganisation, part 3 Add: - csit-vpp-perf-verify Change-Id: Ifc97228f5066f5a2ab3404b9b62d09b49af3f061 Signed-off-by: Tibor Frank --- bootstrap-verify-perf.sh | 48 ++++++++++++++++++++++ docs/tag_documentation.rst | 20 +++++++++ .../10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot | 2 +- ...10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot | 2 +- tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot | 2 +- .../perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot | 2 +- tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot | 2 +- .../10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot | 2 +- tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot | 2 +- .../10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot | 2 +- 10 files changed, 76 insertions(+), 8 deletions(-) diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 91d3e7c8c5..0fcbac69de 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -184,6 +184,54 @@ case "$TEST_TAG" in tests/ RETURN_STATUS=$(echo $?) ;; + VERIFY-PERF-IP4 ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip4baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-IP6 ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip6baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-L2 ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cANDl2xcbaseORndrdiscANDnic_intel-x520-da2AND1t1cANDl2bdbase \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-LISP ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cANDlisp \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-VXLAN ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvxlan \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-VHOST ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ + tests/ + RETURN_STATUS=$(echo $?) + ;; PERFTEST_LONG ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ diff --git a/docs/tag_documentation.rst b/docs/tag_documentation.rst index 11fc26ff4a..b0210becf1 100644 --- a/docs/tag_documentation.rst +++ b/docs/tag_documentation.rst @@ -179,6 +179,26 @@ Test type tags Baseline test cases, no encapsulation, no feature(s) configured in tests. +.. topic:: IP4BASE + + IPv4 baseline test cases, no encapsulation, no feature(s) configured in + tests. + +.. topic:: IP6BASE + + IPv6 baseline test cases, no encapsulation, no feature(s) configured in + tests. + +.. topic:: L2XCBASE + + L2XC baseline test cases, no encapsulation, no feature(s) configured in + tests. + +.. topic:: L2BDBASE + + L2BD baseline test cases, no encapsulation, no feature(s) configured in + tests. + .. topic:: SCALE Scale test cases. diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot index ed4fa470be..d77674d898 100644 --- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot +++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.NodePath | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK -| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE +| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | L2BDBASE | ... | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L2 | Intel-X520-DA2 diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot index 213cb3218e..04eca8c9ab 100644 --- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/performance.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC -| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE +| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | L2BDBASE | ... | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L2 | Intel-X520-DA2 diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot index b5d7ca8ce0..0a30226fd4 100644 --- a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot +++ b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot @@ -17,7 +17,7 @@ | Library | resources.libraries.python.NodePath | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK -| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE +| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | L2XCBASE | ... | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L2 | Intel-X520-DA2 diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot index 17f46f392f..b8a61b501f 100644 --- a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot @@ -17,7 +17,7 @@ | Library | resources.libraries.python.NodePath | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC -| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE +| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | L2XCBASE | ... | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L2 | Intel-X520-DA2 diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot index 814f232639..30d3d97591 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot @@ -22,7 +22,7 @@ | ... | WITH NAME | dut2_v4 | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK -| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE +| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | IP4BASE | ... | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L3 | Intel-X520-DA2 diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot index 4c608e2ded..4e9150fde8 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot @@ -22,7 +22,7 @@ | ... | WITH NAME | dut2_v4 | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC -| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE +| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | IP4BASE | ... | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L3 | Intel-X520-DA2 diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot index 151a6a9460..33268f78f7 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/performance.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK -| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE +| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE | IP6BASE | ... | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L3 | Intel-X520-DA2 diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot index ced6962226..f9b66ffca5 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/performance.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC -| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE +| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE | IP6BASE | ... | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L3 | Intel-X520-DA2 -- 2.16.6