From 967784b8733f6d4072207309bd45738051af2ed8 Mon Sep 17 00:00:00 2001
From: Miroslav Miklus <mmiklus@cisco.com>
Date: Tue, 12 Jul 2016 15:14:40 +0200
Subject: CSIT-106 Introduced SKIP_PATCH tag in perf suite

This patch introduces SKIP_PATCH tag for the performance suitee and
reduce number of executed Long* test cases fo the verify jobs. This
patch should save approximately 20 minutes for each perf Long suite
(30min. -> 10min.).

Change-Id: Ia4765ab925a1aecdd8834f56049cdf1e2b36b12a
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
---
 .../Long_Bridge_Domain_Intel-X520-DA2.robot        | 26 +++++++++++-----------
 .../performance/Long_IPv4_Cop_Intel-X520-DA2.robot | 26 +++++++++++-----------
 .../performance/Long_IPv4_Intel-X520-DA2.robot     | 26 +++++++++++-----------
 .../Long_IPv4_iAcl_Intel-X520-DA2.robot            | 26 +++++++++++-----------
 .../performance/Long_IPv6_Cop_Intel-X520-DA2.robot | 26 +++++++++++-----------
 .../performance/Long_IPv6_Intel-X520-DA2.robot     | 26 +++++++++++-----------
 .../Long_Xconnect_Dot1ad_Intel-X520-DA2.robot      | 26 +++++++++++-----------
 .../Long_Xconnect_Dot1q_Intel-X520-DA2.robot       | 26 +++++++++++-----------
 .../performance/Long_Xconnect_Intel-X520-DA2.robot | 26 +++++++++++-----------
 .../Short_IPv4_iAcl_Intel-X520-DA2.robot           |  2 +-
 10 files changed, 118 insertions(+), 118 deletions(-)

(limited to 'tests/suites')

diff --git a/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot b/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot
index 257694055f..00f301e51b 100644
--- a/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot
@@ -50,7 +50,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -96,7 +96,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -142,7 +142,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -186,7 +186,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -232,7 +232,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -254,7 +254,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -278,7 +278,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -299,7 +299,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -322,7 +322,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -368,7 +368,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -390,7 +390,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -414,7 +414,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -435,7 +435,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
diff --git a/tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot
index 0920e543ad..802ec7b76d 100644
--- a/tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot
@@ -54,7 +54,7 @@
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 64 Byte frames using binary search start at 10GE linerate,
 | | ... | step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -114,7 +114,7 @@
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -174,7 +174,7 @@
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -232,7 +232,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 64 Byte frames using binary search start at 10GE linerate,
 | | ... | step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -292,7 +292,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -321,7 +321,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -352,7 +352,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -380,7 +380,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -410,7 +410,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 64 Byte frames using binary search start at 10GE linerate,
 | | ... | step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -470,7 +470,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -499,7 +499,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -530,7 +530,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -558,7 +558,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
diff --git a/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot
index 9267591635..749ee138a0 100644
--- a/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot
@@ -54,7 +54,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -100,7 +100,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -146,7 +146,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -190,7 +190,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -236,7 +236,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -258,7 +258,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -282,7 +282,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -303,7 +303,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -326,7 +326,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -372,7 +372,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -394,7 +394,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -418,7 +418,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -439,7 +439,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
diff --git a/tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot
index cc31d4a41c..acf624514b 100644
--- a/tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot
@@ -54,7 +54,7 @@
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 64 Byte frames using binary search start at 10GE linerate,
 | | ... | step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -130,7 +130,7 @@
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -206,7 +206,7 @@
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -280,7 +280,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 64 Byte frames using binary search start at 10GE linerate,
 | | ... | step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -356,7 +356,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -393,7 +393,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -432,7 +432,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -468,7 +468,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -506,7 +506,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 64 Byte frames using binary search start at 10GE linerate,
 | | ... | step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -582,7 +582,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -619,7 +619,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -658,7 +658,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -694,7 +694,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
diff --git a/tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot
index e19fe619e6..8f80e738b3 100644
--- a/tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot
@@ -52,7 +52,7 @@
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
 | | ... | step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_78B}
@@ -112,7 +112,7 @@
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -172,7 +172,7 @@
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -230,7 +230,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
 | | ... | step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_78B}
@@ -290,7 +290,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -319,7 +319,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -350,7 +350,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -378,7 +378,7 @@
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -408,7 +408,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
 | | ... | step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_78B}
@@ -468,7 +468,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -497,7 +497,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -528,7 +528,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -556,7 +556,7 @@
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
 | | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
diff --git a/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot
index 4f6804acd1..5664ce4b36 100644
--- a/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot
@@ -48,7 +48,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 78 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_78B}
@@ -94,7 +94,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -140,7 +140,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -184,7 +184,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 78 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_78B}
@@ -230,7 +230,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -252,7 +252,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -276,7 +276,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -297,7 +297,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -320,7 +320,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 78 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_78B}
@@ -366,7 +366,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -388,7 +388,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -412,7 +412,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -433,7 +433,7 @@
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
diff --git a/tests/suites/performance/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot b/tests/suites/performance/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot
index 3c4ad5829f..07b8468606 100644
--- a/tests/suites/performance/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot
@@ -58,7 +58,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_72B}
@@ -122,7 +122,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1514 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1514
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1522B}
@@ -186,7 +186,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9008B}
@@ -248,7 +248,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_72B}
@@ -312,7 +312,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1514 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1514
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1522B}
@@ -343,7 +343,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1514 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1514
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1522B}
@@ -376,7 +376,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9008B}
@@ -406,7 +406,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9008B}
@@ -438,7 +438,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_72B}
@@ -502,7 +502,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1514 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1514
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1522B}
@@ -533,7 +533,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 1514 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1514
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1522B}
@@ -566,7 +566,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9008B}
@@ -596,7 +596,7 @@
 | | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9008B}
diff --git a/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot b/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot
index f94d11c8b8..814621f32d 100644
--- a/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot
@@ -53,7 +53,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_68B}
@@ -115,7 +115,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1522B}
@@ -177,7 +177,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9004B}
@@ -237,7 +237,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_68B}
@@ -299,7 +299,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1522B}
@@ -329,7 +329,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1522B}
@@ -361,7 +361,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9004B}
@@ -390,7 +390,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9004B}
@@ -421,7 +421,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_68B}
@@ -483,7 +483,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1522B}
@@ -513,7 +513,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1522B}
@@ -545,7 +545,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9004B}
@@ -574,7 +574,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9004B}
diff --git a/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot b/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot
index 490641ba24..2a964430c6 100644
--- a/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot
@@ -50,7 +50,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -96,7 +96,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -142,7 +142,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -186,7 +186,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -232,7 +232,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -254,7 +254,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -278,7 +278,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -299,7 +299,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -322,7 +322,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -368,7 +368,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -390,7 +390,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -414,7 +414,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
@@ -435,7 +435,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_9000B}
diff --git a/tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot b/tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot
index 0d95c9dcb8..6f6ec3a79d 100644
--- a/tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot
@@ -50,7 +50,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 64 Byte frames using single trial throughput test.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | THIS
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 3.1mpps
-- 
cgit 1.2.3-korg