From 5f922d7053436d9b53646fafaaf2709243d1be03 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Wed, 10 Oct 2018 10:58:41 +0200 Subject: CSIT-1297: Modify the bootstrap.sh to run only selected mrr suites Change-Id: I2f5ac334e09bc35bfaefc112cf0bb7f57290a732 Signed-off-by: Tibor Frank --- resources/libraries/bash/function/common.sh | 19 ++++++++++++------- ...ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot | 2 +- ...p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot | 2 +- ...ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot | 2 +- ...p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot | 2 +- ...ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot | 2 +- ...p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot | 2 +- ...2p1xxv710-ethip4-ip4base-ipolicemarkbase-mrr.robot | 2 +- ...xxv710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot | 2 +- .../perf/ip6/40ge2p1xl710-ethip6-ip6base-mrr.robot | 2 +- .../perf/ip6/40ge2p1xl710-ethip6-ip6base-ndrpdr.robot | 2 +- 11 files changed, 22 insertions(+), 17 deletions(-) diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index a8ce456d86..8b83ab4e7e 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -410,8 +410,8 @@ function select_tags () { "mrrANDnic_cisco-vic-1227AND64b" "mrrANDnic_cisco-vic-1385AND64b" # memif - "mrrANDmemifAND64b" - "mrrANDmemifANDimix" + "mrrANDmemifANDethAND64b" + "mrrANDmemifANDethANDimix" # crypto "mrrANDipsecAND64b" # ip4 base @@ -430,6 +430,10 @@ function select_tags () { "mrrANDip4fwdANDnat44ANDsrc_user_4000AND64b" # ip4 features "mrrANDip4fwdANDfeatureANDnic_intel-*710AND64b" + # TODO: Remove when tags in + # tests/vpp/perf/ip4/*-ipolicemarkbase-*.robot + # are fixed + "mrrANDip4fwdANDpolice_markANDnic_intel-*710AND64b" # ip4 tunnels "mrrANDip4fwdANDencapANDip6unrlayANDip4ovrlayANDnic_intel-x520-da2AND64b" "mrrANDip4fwdANDencapANDnic_intel-*710AND64b" @@ -463,11 +467,11 @@ function select_tags () { "mrrANDl2bdmaclrnANDacl1AND10k_flowsAND64b" "mrrANDl2bdmaclrnANDacl50AND10k_flowsAND64b" # l2bd scale FIB 2M - "mrrANDl2bdmaclrnANDfib_2mAND64b" + "mrrANDl2bdmaclrnANDfib_1mAND64b" # l2bd scale FIB 200k - "mrrANDl2bdmaclrnANDfib_200kANDnic_intel-*710AND64b" + "mrrANDl2bdmaclrnANDfib_100kANDnic_intel-*710AND64b" # l2bd scale FIB 20k - "mrrANDl2bdmaclrnANDfib_20kANDnic_intel-*710AND64b" + "mrrANDl2bdmaclrnANDfib_10kANDnic_intel-*710AND64b" # l2 patch base "mrrANDl2patchAND64b" # srv6 @@ -481,9 +485,10 @@ function select_tags () { "mrrANDvhostANDl2bdmaclrnANDbaseAND64b" "mrrANDvhostANDl2bdmaclrnANDbaseANDimix" # vm vhost ip4 base - "mrrANDvhostANDip4baseAND64b" - "mrrANDvhostANDip4baseANDimix" + "mrrANDvhostANDip4fwdANDbaseAND64b" + "mrrANDvhostANDip4fwdANDbaseANDimix" # Exclude + "!mrrANDip6baseANDdot1qAND78b" "!vhost_256ANDnic_intel-x520-da2" "!vhostANDnic_intel-xl710" "!cfs_opt" diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot index 3f13f6be6d..079d4feee2 100644 --- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.Policer | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR -| ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | POLICE_MARK +| ... | NIC_Intel-X520-DA2 | IP4FWD | FEATURE | POLICE_MARK | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot index 502dfc2ec3..ce7151bb56 100644 --- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.Policer | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR -| ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | POLICE_MARK +| ... | NIC_Intel-X520-DA2 | IP4FWD | FEATURE | POLICE_MARK | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot index 26d86e9b7a..f18b00c043 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.Policer | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR -| ... | NIC_Intel-X710 | IP4FWD | BASE | POLICE_MARK +| ... | NIC_Intel-X710 | IP4FWD | FEATURE | POLICE_MARK | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X710 diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot index e2a97dde25..b2b7d1c381 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.Policer | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR -| ... | NIC_Intel-X710 | IP4FWD | BASE | DOT1Q +| ... | NIC_Intel-X710 | IP4FWD | FEATURE | POLICE_MARK | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X710 diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot index 5da19fe4fc..c90a1dd811 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.Policer | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR -| ... | NIC_Intel-X710 | IP4FWD | BASE | POLICE_MARK +| ... | NIC_Intel-X710 | IP4FWD | FEATURE | POLICE_MARK | ... | Suite Setup | Set up 2-node performance topology with DUT's NIC model | ... | L3 | Intel-X710 diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot index eb77ff0528..919546cc8f 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.Policer | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR -| ... | NIC_Intel-X710 | IP4FWD | BASE | DOT1Q +| ... | NIC_Intel-X710 | IP4FWD | FEATURE | POLICE_MARK | ... | Suite Setup | Set up 2-node performance topology with DUT's NIC model | ... | L3 | Intel-X710 diff --git a/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ipolicemarkbase-mrr.robot b/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ipolicemarkbase-mrr.robot index 52279da35e..7007859259 100644 --- a/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ipolicemarkbase-mrr.robot +++ b/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ipolicemarkbase-mrr.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.Policer | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR -| ... | NIC_Intel-XXV710 | IP4FWD | BASE | POLICE_MARK +| ... | NIC_Intel-XXV710 | IP4FWD | FEATURE | POLICE_MARK | ... | Suite Setup | Set up 2-node performance topology with DUT's NIC model | ... | L3 | Intel-XXV710 diff --git a/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot index 34e09a666e..9f9a88c683 100644 --- a/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-25ge2p1xxv710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.Policer | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR -| ... | NIC_Intel-XXV710 | IP4FWD | BASE | DOT1Q +| ... | NIC_Intel-XXV710 | IP4FWD | FEATURE | POLICE_MARK | ... | Suite Setup | Set up 2-node performance topology with DUT's NIC model | ... | L3 | Intel-XXV710 diff --git a/tests/vpp/perf/ip6/40ge2p1xl710-ethip6-ip6base-mrr.robot b/tests/vpp/perf/ip6/40ge2p1xl710-ethip6-ip6base-mrr.robot index dfa89b790c..ff5ca75249 100644 --- a/tests/vpp/perf/ip6/40ge2p1xl710-ethip6-ip6base-mrr.robot +++ b/tests/vpp/perf/ip6/40ge2p1xl710-ethip6-ip6base-mrr.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/performance/performance_setup.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR -| ... | NIC_Intel-XL710 | ETH | IP6FWD | BASE +| ... | NIC_Intel-XL710 | ETH | IP6FWD | BASE | IP6BASE | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-XL710 diff --git a/tests/vpp/perf/ip6/40ge2p1xl710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/40ge2p1xl710-ethip6-ip6base-ndrpdr.robot index b228b1bbef..2d1d1bd7fc 100644 --- a/tests/vpp/perf/ip6/40ge2p1xl710-ethip6-ip6base-ndrpdr.robot +++ b/tests/vpp/perf/ip6/40ge2p1xl710-ethip6-ip6base-ndrpdr.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/performance/performance_setup.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR -| ... | NIC_Intel-XL710 | ETH | IP6FWD | BASE +| ... | NIC_Intel-XL710 | ETH | IP6FWD | BASE | IP6BASE | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-XL710 -- cgit 1.2.3-korg