X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecifications%2Freport%2Fenvironment.yaml;h=140a79c66677ee2aae29bef4ca7e302a40941337;hp=10d61f56e4915eadb0dcb0e6df5d9abf5b9f693e;hb=ac1fbfcd12d5bd4db1b04bbf27b6d47880bcd3e7;hpb=c763cfcb064e4f4acf6b8309b08d3800b9bd5331

diff --git a/resources/tools/presentation/specifications/report/environment.yaml b/resources/tools/presentation/specifications/report/environment.yaml
index 10d61f56e4..140a79c666 100644
--- a/resources/tools/presentation/specifications/report/environment.yaml
+++ b/resources/tools/presentation/specifications/report/environment.yaml
@@ -31,6 +31,7 @@
     DIR[STATIC]: "{DIR[BUILD,HTML]}/_static"
     DIR[STATIC,VPP]: "{DIR[STATIC]}/vpp"
     DIR[STATIC,DPDK]: "{DIR[STATIC]}/dpdk"
+    DIR[STATIC,TREX]: "{DIR[STATIC]}/trex"
     DIR[STATIC,ARCH]: "{DIR[STATIC]}/archive"
 
     # Detailed test results
@@ -43,6 +44,7 @@
     DIR[DTR,PERF,DPDK,3N,DNV]: "{DIR[DTR]}/dpdk_performance_results_3n_dnv"
     DIR[DTR,PERF,DPDK,3N,TSH]: "{DIR[DTR]}/dpdk_performance_results_3n_tsh"
     DIR[DTR,PERF,DPDK,2N,TX2]: "{DIR[DTR]}/dpdk_performance_results_2n_tx2"
+    DIR[DTR,PERF,TREX,2N,SKX]: "{DIR[DTR]}/trex_performance_results_2n_skx"
     DIR[DTR,PERF,VPP,ALL]: "{DIR[DTR]}/vpp_performance_results"
     DIR[DTR,PERF,VPP,3N,SKX]: "{DIR[DTR]}/vpp_performance_results_3n_skx"
     DIR[DTR,PERF,VPP,2N,SKX]: "{DIR[DTR]}/vpp_performance_results_2n_skx"
@@ -54,6 +56,8 @@
     DIR[DTR,PERF,VPP,2N,TX2]: "{DIR[DTR]}/vpp_performance_results_2n_tx2"
     DIR[DTR,PERF,VPP,3N,DNV]: "{DIR[DTR]}/vpp_performance_results_3n_dnv"
     DIR[DTR,PERF,VPP,2N,DNV]: "{DIR[DTR]}/vpp_performance_results_2n_dnv"
+    DIR[DTR,PERF,VPP,3N,AWS]: "{DIR[DTR]}/vpp_performance_results_3n_aws"
+    DIR[DTR,PERF,VPP,2N,AWS]: "{DIR[DTR]}/vpp_performance_results_2n_aws"
     DIR[DTR,MRR,VPP,ALL]: "{DIR[DTR]}/vpp_mrr_results"
     DIR[DTR,MRR,VPP,3N,SKX]: "{DIR[DTR]}/vpp_mrr_results_3n_skx"
     DIR[DTR,MRR,VPP,2N,SKX]: "{DIR[DTR]}/vpp_mrr_results_2n_skx"
@@ -65,6 +69,8 @@
     DIR[DTR,MRR,VPP,2N,TX2]: "{DIR[DTR]}/vpp_mrr_results_2n_tx2"
     DIR[DTR,MRR,VPP,3N,DNV]: "{DIR[DTR]}/vpp_mrr_results_3n_dnv"
     DIR[DTR,MRR,VPP,2N,DNV]: "{DIR[DTR]}/vpp_mrr_results_2n_dnv"
+    DIR[DTR,MRR,VPP,3N,AWS]: "{DIR[DTR]}/vpp_mrr_results_3n_aws"
+    DIR[DTR,MRR,VPP,2N,AWS]: "{DIR[DTR]}/vpp_mrr_results_2n_aws"
     DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTR]}/vpp_device_results_ubuntu"
 
     # Detailed test configurations
@@ -80,6 +86,8 @@
     DIR[DTC,PERF,VPP,2N,TX2]: "{DIR[DTC]}/vpp_performance_configuration_2n_tx2"
     DIR[DTC,PERF,VPP,3N,DNV]: "{DIR[DTC]}/vpp_performance_configuration_3n_dnv"
     DIR[DTC,PERF,VPP,2N,DNV]: "{DIR[DTC]}/vpp_performance_configuration_2n_dnv"
+    DIR[DTC,PERF,VPP,3N,AWS]: "{DIR[DTC]}/vpp_performance_configuration_3n_aws"
+    DIR[DTC,PERF,VPP,2N,AWS]: "{DIR[DTC]}/vpp_performance_configuration_2n_aws"
     DIR[DTC,MRR,VPP,ALL]: "{DIR[DTC]}/vpp_mrr_configuration"
     DIR[DTC,MRR,VPP,3N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_3n_skx"
     DIR[DTC,MRR,VPP,2N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_skx"
@@ -91,6 +99,8 @@
     DIR[DTC,MRR,VPP,2N,TX2]: "{DIR[DTC]}/vpp_mrr_configuration_2n_tx2"
     DIR[DTC,MRR,VPP,3N,DNV]: "{DIR[DTC]}/vpp_mrr_configuration_3n_dnv"
     DIR[DTC,MRR,VPP,2N,DNV]: "{DIR[DTC]}/vpp_mrr_configuration_2n_dnv"
+    DIR[DTC,MRR,VPP,3N,AWS]: "{DIR[DTC]}/vpp_mrr_configuration_3n_aws"
+    DIR[DTC,MRR,VPP,2N,AWS]: "{DIR[DTC]}/vpp_mrr_configuration_2n_aws"
     DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTC]}/vpp_device_configuration_ubuntu"
 
     # Detailed tests operational data
@@ -106,10 +116,13 @@
     DIR[DTO,PERF,VPP,2N,TX2]: "{DIR[DTO]}/vpp_performance_operational_data_2n_tx2"
     DIR[DTO,PERF,VPP,3N,DNV]: "{DIR[DTO]}/vpp_performance_operational_data_3n_dnv"
     DIR[DTO,PERF,VPP,2N,DNV]: "{DIR[DTO]}/vpp_performance_operational_data_2n_dnv"
+    DIR[DTO,PERF,VPP,3N,AWS]: "{DIR[DTO]}/vpp_performance_operational_data_3n_aws"
+    DIR[DTO,PERF,VPP,2N,AWS]: "{DIR[DTO]}/vpp_performance_operational_data_2n_aws"
 
     # Latencies:
     DIR[LAT,VPP]: "{DIR[WORKING,SRC]}/vpp_performance_tests/hdrh_packet_latency_by_percentile_graphs"
     DIR[LAT,DPDK]: "{DIR[WORKING,SRC]}/dpdk_performance_tests/hdrh_packet_latency_by_percentile_graphs"
+    DIR[LAT,TREX]: "{DIR[WORKING,SRC]}/trex_performance_tests/hdrh_packet_latency_by_percentile_graphs"
 
     # .css patch file to fix tables generated by Sphinx
     DIR[CSS_PATCH_FILE]: "{DIR[STATIC]}/theme_overrides.css"
@@ -117,14 +130,13 @@
 
   # 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"
+    # XML
+    - type: "xml"
+      url: "https://s3-logs.fd.io/vex-yul-rot-jenkins-1"
       path: "{job}/{build}/{filename}"
-      file-name: "output.json.gz"
+      file-name: "output_info.xml.gz"
       file-format: ".gz"
-      enabled: False
-    # XML
+      enabled: True
     - type: "xml"
       url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
       path: "{job}/{build}/archives/{filename}"
@@ -137,16 +149,18 @@
       file-name: "output_info.xml.gz"
       file-format: ".gz"
       enabled: True
+    # To be deprecated soon:
     - 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
+    # Deprecated:
     - 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"
@@ -163,8 +177,8 @@
       enabled: True
     - type: "xml"
       url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
-      path: "{job}/{build}/{filename}"
-      file-name: "output_info.xml.gz"
+      path: "{job}/{build}/archives/{filename}"
+      file-name: "output.xml.gz"
       file-format: ".gz"
       enabled: True
     - type: "xml"
@@ -191,7 +205,14 @@
       path: "report/_static/archive"
       file-name: "robot-plugin.zip"
       file-format: ".zip"
-      enabled: True
+      enabled: False
+    # 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
 
@@ -205,6 +226,7 @@
     - "DIR[WORKING,DATA]"
     - "DIR[STATIC,VPP]"
     - "DIR[STATIC,DPDK]"
+    - "DIR[STATIC,TREX]"
     - "DIR[STATIC,ARCH]"
     - "DIR[BUILD,LATEX]"
     - "DIR[WORKING,SRC]"
@@ -263,6 +285,6 @@
   output: "report"
   format:
     html:
-    - full
-#     pdf:
-#     - minimal
+      - full
+    # pdf:
+    #   - minimal