Trending: Fix aws graphs

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

2 files changed, 12 insertions, 8 deletions

diff --git a/resources/tools/presentation/specifications/trending/elements.yaml b/resources/tools/presentation/specifications/trending/elements.yaml
index 21e5d5cb25..d9f2120a03 100644
--- a/resources/tools/presentation/specifications/trending/elements.yaml
+++ b/resources/tools/presentation/specifications/trending/elements.yaml
@@ -2058,8 +2058,8 @@
       data: "plot-performance-trending-vpp-2n-aws"
       core: ["2t1c", "4t2c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-mrr.64B-1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale2m-mrr.64B-1c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-mrr.64B-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale2m-mrr.64B-{core}-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
     - title: "2n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena"
@@ -2067,8 +2067,8 @@
       data: "plot-performance-trending-vpp-2n-aws"
       core: ["2t1c", "4t2c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-mrr.1518B-1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale2m-mrr.1518B-1c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-mrr.1518B-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale2m-mrr.1518B-{core}-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-x710-64b-{core}-ip4routing-base-scale-avf-dpdk"
@@ -2301,8 +2301,8 @@
       data: "plot-performance-trending-vpp-3n-aws"
       core: ["2t1c", "4t2c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-mrr.64B-1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale2m-mrr.64B-1c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-mrr.64B-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale2m-mrr.64B-{core}-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
     - title: "3n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena"
@@ -2310,8 +2310,8 @@
       data: "plot-performance-trending-vpp-3n-aws"
       core: ["2t1c", "4t2c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-mrr.1518B-1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale2m-mrr.1518B-1c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-mrr.1518B-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale2m-mrr.1518B-{core}-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-x710-64b-{core}-ip4routing-base-scale-avf"
diff --git a/resources/tools/presentation/specifications/trending/environment.yaml b/resources/tools/presentation/specifications/trending/environment.yaml
index 5868fd9d5a..0c3b7b8f46 100644
--- a/resources/tools/presentation/specifications/trending/environment.yaml
+++ b/resources/tools/presentation/specifications/trending/environment.yaml
@@ -192,6 +192,8 @@
           - "last-failed-tests-vpp-2n-tx2-mrr"
           - "last-failed-tests-vpp-2n-dnv-mrr"
           - "last-failed-tests-vpp-3n-dnv-mrr"
+          - "last-failed-tests-vpp-2n-aws-mrr"
+          - "last-failed-tests-vpp-3n-aws-mrr"
           - "last-failed-tests-dpdk-2n-skx-mrr"
           - "last-failed-tests-dpdk-3n-skx-mrr"
           - "last-failed-tests-dpdk-2n-clx-mrr"
@@ -209,6 +211,8 @@
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-tx2"
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-dnv"
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-dnv"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-weekly-master-2n-aws"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-weekly-master-3n-aws"
           - "https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx"
           - "https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx"
           - "https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-clx"