Trending: Implement the latest changes in job specs

Graphs:
 - MRR
   - 2n-clx
   - 2n-skx
   - 3n-skx
   - 3n-hsw
   - 3n-tsh
 - NDRPDR
   - 2n-skx
   - 3n-skx
   - 3n-hsw
   - 2n-clx

Change-Id: Ieab26ba1d2ee56e66c5c8598c4dba240a14e53e9
Signed-off-by: Tibor Frank <tifrank@cisco.com>

14 files changed, 233 insertions, 336 deletions

diff --git a/docs/cpta/trending/container_memif.rst b/docs/cpta/trending/container_memif.rst
index 17784c46c6..43e5e9db7f 100644
--- a/docs/cpta/trending/container_memif.rst
+++ b/docs/cpta/trending/container_memif.rst
@@ -3,8 +3,8 @@ LXC/DRC Container Memif
 
 .. toctree::
 
+    container_memif-2n-clx-xxv710
+    container_memif-2n-clx-cx556a
     container_memif-2n-skx-xxv710
     container_memif-3n-skx-xxv710
     container_memif-3n-tsh-x520
-    container_memif-2n-clx-xxv710
-    container_memif-2n-clx-cx556a
diff --git a/docs/cpta/trending/ip4-2n-clx-xxv710.rst b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
index c7b4af245b..fdb6830f0a 100644
--- a/docs/cpta/trending/ip4-2n-clx-xxv710.rst
+++ b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
@@ -1,8 +1,8 @@
 2n-clx-xxv710
 -------------
 
-64b-ip4routing-base-avf
-```````````````````````
+64b-ip4routing-base-avf-dpdk
+````````````````````````````
 
 2t1c
 ::::
@@ -10,6 +10,7 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-base-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -24,6 +25,7 @@
 .. raw:: html
 
     <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-base-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -38,56 +40,12 @@
 .. raw:: html
 
     <a name="64b-8t4c-base-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-base-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-base-dpdk
-````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-base-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-4t2c-ip4-base-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
     <a name="64b-8t4c-base-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-base-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -180,48 +138,3 @@
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-scale-dpdk.html"></iframe>
     <p><br></p>
     </center>
-
-64b-features-ip4routing-base-dpdk
-`````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-4t2c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-xxv710.rst b/docs/cpta/trending/ip4-3n-skx-xxv710.rst
index fb1680ff73..85cf460e40 100644
--- a/docs/cpta/trending/ip4-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/ip4-3n-skx-xxv710.rst
@@ -97,98 +97,99 @@
     <p><br></p>
     </center>
 
-64b-features-ip4routing-base-avf
-````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-avf"></a>
-    <a name="64b-2t1c-features-iacl50-avf"></a>
-    <a name="64b-2t1c-features-oacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-avf"></a>
-    <a name="64b-4t2c-features-iacl50-avf"></a>
-    <a name="64b-4t2c-features-oacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-avf"></a>
-    <a name="64b-8t4c-features-iacl50-avf"></a>
-    <a name="64b-8t4c-features-oacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-features-ip4routing-base-dpdk
-`````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
+..
+    64b-features-ip4routing-base-avf
+    ````````````````````````````````
+
+    2t1c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-features-avf"></a>
+        <a name="64b-2t1c-features-iacl50-avf"></a>
+        <a name="64b-2t1c-features-oacl50-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    4t2c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-4t2c-features-avf"></a>
+        <a name="64b-4t2c-features-iacl50-avf"></a>
+        <a name="64b-4t2c-features-oacl50-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    8t4c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-8t4c-features-avf"></a>
+        <a name="64b-8t4c-features-iacl50-avf"></a>
+        <a name="64b-8t4c-features-oacl50-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    64b-features-ip4routing-base-dpdk
+    `````````````````````````````````
+
+    2t1c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-features-dpdk"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-dpdk.html"></iframe>
+        <p><br></p>
+        </center>
+
+    4t2c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-4t2c-features-dpdk"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-dpdk.html"></iframe>
+        <p><br></p>
+        </center>
+
+    8t4c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-8t4c-features-dpdk"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-dpdk.html"></iframe>
+        <p><br></p>
+        </center>
diff --git a/docs/cpta/trending/ip4.rst b/docs/cpta/trending/ip4.rst
index 5b5b495dc2..39f73ff5ad 100644
--- a/docs/cpta/trending/ip4.rst
+++ b/docs/cpta/trending/ip4.rst
@@ -3,6 +3,9 @@ IPv4 Routing
 
 .. toctree::
 
+    ip4-2n-clx-xxv710
+    ip4-2n-clx-x710
+    ip4-2n-clx-cx556a
     ip4-2n-skx-xxv710
     ip4-2n-skx-x710
     ip4-3n-skx-xxv710
@@ -11,6 +14,3 @@ IPv4 Routing
     ip4-3n-tsh-x520
     ip4-2n-dnv-x553
     ip4-3n-dnv-x553
-    ip4-2n-clx-xxv710
-    ip4-2n-clx-x710
-    ip4-2n-clx-cx556a
diff --git a/docs/cpta/trending/ip6.rst b/docs/cpta/trending/ip6.rst
index 8b83575ab4..02ddee81aa 100644
--- a/docs/cpta/trending/ip6.rst
+++ b/docs/cpta/trending/ip6.rst
@@ -3,6 +3,9 @@ IPv6 Routing
 
 .. toctree::
 
+    ip6-2n-clx-xxv710
+    ip6-2n-clx-x710
+    ip6-2n-clx-cx556a
     ip6-2n-skx-xxv710
     ip6-2n-skx-x710
     ip6-3n-skx-xxv710
@@ -11,6 +14,3 @@ IPv6 Routing
     ip6-3n-tsh-x520
     ip6-2n-dnv-x553
     ip6-3n-dnv-x553
-    ip6-2n-clx-xxv710
-    ip6-2n-clx-x710
-    ip6-2n-clx-cx556a
diff --git a/docs/cpta/trending/ipsec-3n-tsh-x520.rst b/docs/cpta/trending/ipsec-3n-tsh-x520.rst
index fd1f76feec..a437766b56 100644
--- a/docs/cpta/trending/ipsec-3n-tsh-x520.rst
+++ b/docs/cpta/trending/ipsec-3n-tsh-x520.rst
@@ -4,14 +4,6 @@
 imix-ipsec-ip4routing-base-scale-sw-ixgbe
 `````````````````````````````````````````
 
-..
-    10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr
-    10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-    10ge2p1x520-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr
-    10ge2p1x520-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-    10ge2p1x520-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr
-    10ge2p1x520-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-
 1t1c
 ::::
 
@@ -56,3 +48,51 @@ imix-ipsec-ip4routing-base-scale-sw-ixgbe
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-imix-4t4c-ipsec-base-scale-sw-ixgbe.html"></iframe>
     <p><br></p>
     </center>
+
+1518b-ipsec-ip4routing-base-scale-sw-ixgbe
+``````````````````````````````````````````
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="1518b-1t1c-base-sw-ixgbe"></a>
+    <a name="1518b-1t1c-scale-sw-ixgbe"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-1518b-1t1c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="1518b-2t2c-base-sw-ixgbe"></a>
+    <a name="1518b-2t2c-scale-sw-ixgbe"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-1518b-2t2c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="1518b-4t4c-base-sw-ixgbe"></a>
+    <a name="1518b-4t4c-scale-sw-ixgbe"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-1518b-4t4c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-2n-clx-x710.rst b/docs/cpta/trending/l2-2n-clx-x710.rst
index dfc178107f..9343c3a815 100644
--- a/docs/cpta/trending/l2-2n-clx-x710.rst
+++ b/docs/cpta/trending/l2-2n-clx-x710.rst
@@ -1,8 +1,8 @@
 2n-clx-x710
 -----------
 
-64b-l2switching-base-scale-avf
-``````````````````````````````
+64b-l2switching-base-scale-avf-dpdk
+```````````````````````````````````
 
 2t1c
 ::::
@@ -11,6 +11,8 @@
 
     <a name="64b-2t1c-base-avf"></a>
     <a name="64b-2t1c-scale-avf"></a>
+    <a name="64b-2t1c-base-dpdk"></a>
+    <a name="64b-2t1c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -26,6 +28,8 @@
 
     <a name="64b-4t2c-base-avf"></a>
     <a name="64b-4t2c-scale-avf"></a>
+    <a name="64b-4t2c-base-dpdk"></a>
+    <a name="64b-4t2c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -41,59 +45,12 @@
 
     <a name="64b-8t4c-base-avf"></a>
     <a name="64b-8t4c-scale-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-8t4c-l2-base-scale-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-
-64b-l2switching-base-scale-avf-dpdk
-```````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-scale-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-base-dpdk"></a>
-    <a name="64b-4t2c-scale-dpdk"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-4t2c-l2-base-scale-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
     <a name="64b-8t4c-base-dpdk"></a>
     <a name="64b-8t4c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-8t4c-l2-base-scale-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-8t4c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-2n-skx-x710.rst b/docs/cpta/trending/l2-2n-skx-x710.rst
index e557f6ca9b..720c4af41a 100644
--- a/docs/cpta/trending/l2-2n-skx-x710.rst
+++ b/docs/cpta/trending/l2-2n-skx-x710.rst
@@ -1,8 +1,8 @@
 2n-skx-x710
 -----------
 
-64b-l2switching-base-scale-avf-dpdk
-```````````````````````````````````
+64b-l2switching-base-scale-avf
+``````````````````````````````
 
 2t1c
 ::::
@@ -10,14 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf"></a>
-    <a name="64b-2t1c-base-avf"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
+    <a name="64b-2t1c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -27,14 +25,12 @@
 .. raw:: html
 
     <a name="64b-4t2c-base-avf"></a>
-    <a name="64b-4t2c-base-avf"></a>
-    <a name="64b-4t2c-scale-dpdk"></a>
-    <a name="64b-4t2c-scale-dpdk"></a>
+    <a name="64b-4t2c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-4t2c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-4t2c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -44,13 +40,59 @@
 .. raw:: html
 
     <a name="64b-8t4c-base-avf"></a>
-    <a name="64b-8t4c-base-avf"></a>
-    <a name="64b-8t4c-scale-dpdk"></a>
+    <a name="64b-8t4c-scale-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-8t4c-l2-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-scale-dpdk
+```````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-dpdk"></a>
+    <a name="64b-2t1c-scale-dpdk"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-dpdk"></a>
+    <a name="64b-4t2c-scale-dpdk"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-4t2c-l2-base-scale-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-dpdk"></a>
     <a name="64b-8t4c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-8t4c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-8t4c-l2-base-scale-dpdk.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-skx-xxv710.rst b/docs/cpta/trending/l2-3n-skx-xxv710.rst
index 93dbe05039..236f4e9660 100644
--- a/docs/cpta/trending/l2-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/l2-3n-skx-xxv710.rst
@@ -91,8 +91,8 @@
     <p><br></p>
     </center>
 
-64b-l2switching-base-scale-dpdk
-```````````````````````````````
+64b-l2switching-base-scale-avf-dpdk
+```````````````````````````````````
 
 2t1c
 ::::
@@ -138,57 +138,3 @@
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-l2-base-scale-dpdk.html"></iframe>
     <p><br></p>
     </center>
-
-64b-features-l2switching-base-avf
-`````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-avf"></a>
-    <a name="64b-2t1c-features-iacl50-avf"></a>
-    <a name="64b-2t1c-features-oacl50-avf"></a>
-    <a name="64b-2t1c-features-macip-iacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-avf"></a>
-    <a name="64b-4t2c-features-iacl50-avf"></a>
-    <a name="64b-4t2c-features-oacl50-avf"></a>
-    <a name="64b-4t2c-features-macip-iacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-l2-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-avf"></a>
-    <a name="64b-8t4c-features-iacl50-avf"></a>
-    <a name="64b-8t4c-features-oacl50-avf"></a>
-    <a name="64b-8t4c-features-macip-iacl50-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-l2-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/l2.rst b/docs/cpta/trending/l2.rst
index 3d7e6c7d92..2d40875cef 100644
--- a/docs/cpta/trending/l2.rst
+++ b/docs/cpta/trending/l2.rst
@@ -3,6 +3,9 @@ L2 Ethernet Switching
 
 .. toctree::
 
+    l2-2n-clx-xxv710
+    l2-2n-clx-x710
+    l2-2n-clx-cx556a
     l2-2n-skx-xxv710
     l2-2n-skx-x710
     l2-3n-skx-xxv710
@@ -11,6 +14,3 @@ L2 Ethernet Switching
     l2-3n-tsh-x520
     l2-2n-dnv-x553
     l2-3n-dnv-x553
-    l2-2n-clx-xxv710
-    l2-2n-clx-x710
-    l2-2n-clx-cx556a
diff --git a/docs/cpta/trending/srv6.rst b/docs/cpta/trending/srv6.rst
index 96451d8c17..6c177ac510 100644
--- a/docs/cpta/trending/srv6.rst
+++ b/docs/cpta/trending/srv6.rst
@@ -3,9 +3,9 @@ SRv6 Routing
 
 .. toctree::
 
-    srv6-3n-skx-xxv710
     srv6-3n-hsw-xl710
     srv6-3n-tsh-x520
 
 ..
+    srv6-3n-skx-xxv710
     srv6-3n-dnv-x553
diff --git a/docs/cpta/trending/vhost.rst b/docs/cpta/trending/vhost.rst
index e9e869f6f2..a33e599d82 100644
--- a/docs/cpta/trending/vhost.rst
+++ b/docs/cpta/trending/vhost.rst
@@ -3,13 +3,13 @@ VMs vhost-user
 
 .. toctree::
 
+    vhost-2n-clx-xxv710
+    vhost-2n-clx-cx556a
     vhost-2n-skx-xxv710
     vhost-3n-skx-xxv710
     vhost-3n-skx-x710
     vhost-3n-hsw-xl710
     vhost-3n-tsh-x520
-    vhost-2n-clx-xxv710
-    vhost-2n-clx-cx556a
 
 ..
     vhost-3n-skx-x710 - keeps failing
diff --git a/docs/cpta/trending/vts-2n-skx-xxv710.rst b/docs/cpta/trending/vts-2n-skx-xxv710.rst
index 417b0ef58d..697f6ec5ca 100644
--- a/docs/cpta/trending/vts-2n-skx-xxv710.rst
+++ b/docs/cpta/trending/vts-2n-skx-xxv710.rst
@@ -1,21 +1,20 @@
 2n-skx-xxv710
 -------------
 
-114b-vts-l2switching-base-avf-dpdk
-``````````````````````````````````
+114b-vts-l2switching-base-avf
+`````````````````````````````
 
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="114b-2t1c-base-dpdk"></a>
     <a name="114b-2t1c-base-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,13 +23,12 @@
 
 .. raw:: html
 
-    <a name="114b-4t2c-base-dpdk"></a>
     <a name="114b-4t2c-base-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -39,12 +37,11 @@
 
 .. raw:: html
 
-    <a name="114b-8t4c-base-dpdk"></a>
     <a name="114b-8t4c-base-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vts.rst b/docs/cpta/trending/vts.rst
index e5836f462a..8966e927bd 100644
--- a/docs/cpta/trending/vts.rst
+++ b/docs/cpta/trending/vts.rst
@@ -3,4 +3,5 @@ Virtual Topology System
 
 .. toctree::
 
+    vts-2n-clx-xxv710
     vts-2n-skx-xxv710