diff options
author | Tibor Frank <tifrank@cisco.com> | 2018-10-10 10:58:41 +0200 |
---|---|---|
committer | Tibor Frank <tifrank@cisco.com> | 2018-10-10 12:01:52 +0000 |
commit | 5f922d7053436d9b53646fafaaf2709243d1be03 (patch) | |
tree | eb7358fc0d983205721f450c6c9ad42c51ef2ebb /resources/libraries/bash/function | |
parent | 68a4959b2f4b23ecf1c894c10a365fbdbb3dbf6a (diff) |
CSIT-1297: Modify the bootstrap.sh to run only selected mrr suites
Change-Id: I2f5ac334e09bc35bfaefc112cf0bb7f57290a732
Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'resources/libraries/bash/function')
-rw-r--r-- | resources/libraries/bash/function/common.sh | 19 |
1 files changed, 12 insertions, 7 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" |