Report: Add re-test data

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

diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 99470fd..ca006ef 100644 (file)
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -361,15 +361,17 @@
       - 52  # rls2101.rel NDRPDR iter RND env 6
 
   vpp-2n-zn2-prev-iter-new-env:
-    # TODO: Add
     csit-vpp-perf-report-iterative-2106-2n-zn2:
       - 3   # rls2101.rel NDRPDR iter env 7
       - 6   # rls2101.rel NDRPDR iter env 7
       - 4   # rls2101.rel NDRPDR iter env 7
+      - 8   # rls2101.rel NDRPDR iter env 7
       - 9   # rls2101.rel NDRPDR iter env 7
       - 10  # rls2101.rel NDRPDR iter env 7
       - 11  # rls2101.rel NDRPDR iter env 7
       - 21  # rls2101.rel NDRPDR iter env 7
+      - 34  # rls2101.rel NDRPDR iter env 7
+      - 35  # rls2101.rel NDRPDR iter env 7
 
   vpp-2n-zn2-curr-iter:
     csit-vpp-perf-report-iterative-2106-2n-zn2:

diff --git a/resources/tools/presentation/specifications/report/environment.yaml b/resources/tools/presentation/specifications/report/environment.yaml
index 10d61f5..048eca3 100644 (file)
--- a/resources/tools/presentation/specifications/report/environment.yaml
+++ b/resources/tools/presentation/specifications/report/environment.yaml
@@ -117,13 +117,6 @@
 
   # Data sources are used in this order:
   data-sources:
-    # JSON from S3
-    - type: "json"
-      url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
-      path: "{job}/{build}/{filename}"
-      file-name: "output.json.gz"
-      file-format: ".gz"
-      enabled: False
     # XML
     - type: "xml"
       url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
@@ -139,32 +132,32 @@
       enabled: True
     - type: "xml"
       url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
-      path: "{job}/{build}/archives/{filename}"
+      path: "{job}/{build}/{filename}"
       file-name: "output_info.xml.gz"
       file-format: ".gz"
       enabled: True
     - type: "xml"
       url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
       path: "{job}/{build}/archives/{filename}"
-      file-name: "output.xml.gz"
+      file-name: "output_info.xml.gz"
       file-format: ".gz"
       enabled: True
     - type: "xml"
-      url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
+      url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
       path: "{job}/{build}/archives/{filename}"
       file-name: "output.xml.gz"
       file-format: ".gz"
       enabled: True
     - type: "xml"
       url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
-      path: "{job}/{build}/{filename}"
+      path: "{job}/{build}/archives/{filename}"
       file-name: "output.xml.gz"
       file-format: ".gz"
       enabled: True
     - type: "xml"
-      url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
+      url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
       path: "{job}/{build}/{filename}"
-      file-name: "output_info.xml.gz"
+      file-name: "output.xml.gz"
       file-format: ".gz"
       enabled: True
     - type: "xml"
@@ -192,6 +185,13 @@
       file-name: "robot-plugin.zip"
       file-format: ".zip"
       enabled: True
+    # JSON from S3
+    - type: "json"
+      url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
+      path: "{job}/{build}/{filename}"
+      file-name: "output.json.gz"
+      file-format: ".gz"
+      enabled: False
 
   archive-inputs: False