X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecifications%2Freport%2Fenvironment.yaml;h=940313b66243b83f239eb1bef5d79de053c77c63;hp=981f74f6a89df1abccb8f81c1aa9cec63aa68cec;hb=c2d12bb8aefc1b5dc856d2278d7ea81321f74c8f;hpb=a2341daf9f810324c49fa2555e92658aca7e0213

diff --git a/resources/tools/presentation/specifications/report/environment.yaml b/resources/tools/presentation/specifications/report/environment.yaml
index 981f74f6a8..940313b662 100644
--- a/resources/tools/presentation/specifications/report/environment.yaml
+++ b/resources/tools/presentation/specifications/report/environment.yaml
@@ -38,22 +38,20 @@
     DIR[DTR]: "{DIR[WORKING,SRC]}/detailed_test_results"
     DIR[DTR,PERF,DPDK,2N,ICX]: "{DIR[DTR]}/dpdk_performance_results_2n_icx"
     DIR[DTR,PERF,DPDK,3N,ICX]: "{DIR[DTR]}/dpdk_performance_results_3n_icx"
-    DIR[DTR,PERF,DPDK,3N,SKX]: "{DIR[DTR]}/dpdk_performance_results_3n_skx"
-    DIR[DTR,PERF,DPDK,2N,SKX]: "{DIR[DTR]}/dpdk_performance_results_2n_skx"
     DIR[DTR,PERF,DPDK,2N,ZN2]: "{DIR[DTR]}/dpdk_performance_results_2n_zn2"
     DIR[DTR,PERF,DPDK,2N,CLX]: "{DIR[DTR]}/dpdk_performance_results_2n_clx"
     DIR[DTR,PERF,DPDK,2N,DNV]: "{DIR[DTR]}/dpdk_performance_results_2n_dnv"
     DIR[DTR,PERF,DPDK,3N,DNV]: "{DIR[DTR]}/dpdk_performance_results_3n_dnv"
+    DIR[DTR,PERF,DPDK,3N,ALT]: "{DIR[DTR]}/dpdk_performance_results_3n_alt"
     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,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"
     DIR[DTR,PERF,VPP,2N,ZN2]: "{DIR[DTR]}/vpp_performance_results_2n_zn2"
     DIR[DTR,PERF,VPP,2N,CLX]: "{DIR[DTR]}/vpp_performance_results_2n_clx"
     DIR[DTR,PERF,VPP,2N,ICX]: "{DIR[DTR]}/vpp_performance_results_2n_icx"
     DIR[DTR,PERF,VPP,3N,ICX]: "{DIR[DTR]}/vpp_performance_results_3n_icx"
+    DIR[DTR,PERF,VPP,3N,ALT]: "{DIR[DTR]}/vpp_performance_results_3n_alt"
     DIR[DTR,PERF,VPP,3N,TSH]: "{DIR[DTR]}/vpp_performance_results_3n_tsh"
     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"
@@ -61,12 +59,11 @@
     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"
     DIR[DTR,MRR,VPP,2N,ZN2]: "{DIR[DTR]}/vpp_mrr_results_2n_zn2"
     DIR[DTR,MRR,VPP,2N,CLX]: "{DIR[DTR]}/vpp_mrr_results_2n_clx"
     DIR[DTR,MRR,VPP,2N,ICX]: "{DIR[DTR]}/vpp_mrr_results_2n_icx"
     DIR[DTR,MRR,VPP,3N,ICX]: "{DIR[DTR]}/vpp_mrr_results_3n_icx"
+    DIR[DTR,MRR,VPP,3N,ALT]: "{DIR[DTR]}/vpp_mrr_results_3n_alt"
     DIR[DTR,MRR,VPP,3N,TSH]: "{DIR[DTR]}/vpp_mrr_results_3n_tsh"
     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"
@@ -78,12 +75,11 @@
     # Detailed test configurations
     DIR[DTC]: "{DIR[WORKING,SRC]}/test_configuration"
     DIR[DTC,PERF,VPP,ALL]: "{DIR[DTC]}/vpp_performance_configuration"
-    DIR[DTC,PERF,VPP,3N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_3n_skx"
-    DIR[DTC,PERF,VPP,2N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_2n_skx"
     DIR[DTC,PERF,VPP,2N,ZN2]: "{DIR[DTC]}/vpp_performance_configuration_2n_zn2"
     DIR[DTC,PERF,VPP,2N,CLX]: "{DIR[DTC]}/vpp_performance_configuration_2n_clx"
     DIR[DTC,PERF,VPP,2N,ICX]: "{DIR[DTC]}/vpp_performance_configuration_2n_icx"
     DIR[DTC,PERF,VPP,3N,ICX]: "{DIR[DTC]}/vpp_performance_configuration_3n_icx"
+    DIR[DTC,PERF,VPP,3N,ALT]: "{DIR[DTC]}/vpp_performance_configuration_3n_alt"
     DIR[DTC,PERF,VPP,3N,TSH]: "{DIR[DTC]}/vpp_performance_configuration_3n_tsh"
     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"
@@ -91,12 +87,11 @@
     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"
     DIR[DTC,MRR,VPP,2N,ZN2]: "{DIR[DTC]}/vpp_mrr_configuration_2n_zn2"
     DIR[DTC,MRR,VPP,2N,CLX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_clx"
     DIR[DTC,MRR,VPP,2N,ICX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_icx"
     DIR[DTC,MRR,VPP,3N,ICX]: "{DIR[DTC]}/vpp_mrr_configuration_3n_icx"
+    DIR[DTC,MRR,VPP,3N,ALT]: "{DIR[DTC]}/vpp_mrr_configuration_3n_alt"
     DIR[DTC,MRR,VPP,3N,TSH]: "{DIR[DTC]}/vpp_mrr_configuration_3n_tsh"
     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"
@@ -108,12 +103,11 @@
     # Detailed tests operational data
     DIR[DTO]: "{DIR[WORKING,SRC]}/test_operational_data"
     DIR[DTO,PERF,VPP,ALL]: "{DIR[DTO]}/vpp_performance_operational_data"
-    DIR[DTO,PERF,VPP,3N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_3n_skx"
-    DIR[DTO,PERF,VPP,2N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_skx"
     DIR[DTO,PERF,VPP,2N,ZN2]: "{DIR[DTO]}/vpp_performance_operational_data_2n_zn2"
     DIR[DTO,PERF,VPP,2N,CLX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_clx"
     DIR[DTO,PERF,VPP,2N,ICX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_icx"
     DIR[DTO,PERF,VPP,3N,ICX]: "{DIR[DTO]}/vpp_performance_operational_data_3n_icx"
+    DIR[DTO,PERF,VPP,3N,ALT]: "{DIR[DTO]}/vpp_performance_operational_data_3n_alt"
     DIR[DTO,PERF,VPP,3N,TSH]: "{DIR[DTO]}/vpp_performance_operational_data_3n_tsh"
     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"
@@ -139,82 +133,19 @@
       file-name: "output_info.xml.gz"
       file-format: ".gz"
       enabled: True
-    - type: "xml"
-      url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
-      path: "{job}/{build}/archives/{filename}"
-      file-name: "output_info.xml.gz"
-      file-format: ".gz"
-      enabled: True
-    - type: "xml"
-      url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
-      path: "{job}/{build}/{filename}"
-      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}/{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_info.xml.gz"
-      file-format: ".gz"
-      enabled: True
-    - type: "xml"
-      url: "https://logs.nginx.service.consul/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}"
-      file-name: "output.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-format: ".gz"
-      enabled: True
-    - type: "xml"
-      url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
-      path: "{job}/{build}/{filename}"
-      file-name: "output.xml.gz"
-      file-format: ".gz"
-      enabled: True
-    # XML from docs.nexus
+    # XML from S3 docs
     - type: "xml-docs"
-      url: "https://docs.fd.io/csit"
+      url: "https://s3-docs.fd.io/csit"
       path: "report/_static/archive"
       file-name: "output_info.xml.gz"
       file-format: ".gz"
       enabled: True
     - type: "xml-docs"
-      url: "https://docs.fd.io/csit"
+      url: "https://s3-docs.fd.io/csit"
       path: "report/_static/archive"
       file-name: "output.xml.gz"
       file-format: ".gz"
       enabled: True
-    - type: "xml-docs"
-      url: "https://docs.fd.io/csit"
-      path: "report/_static/archive"
-      file-name: "robot-plugin.zip"
-      file-format: ".zip"
-      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
 
@@ -250,23 +181,39 @@
 
   limits:
     nic:
-      x520: 24460000
-      x553: 29761905
-      x710: 35800000
-      xxv710: 35800000
-      xl710: 35800000
-      cx556a: 148809523.81
-      e810cq: 148809523.81
+      x520: 29761904
+      x553: 29761904
+      x710: 29761904
+      xxv710: 37500000
+      xl710: 37500000
+      cx556a: 148809523
+      e810cq: 117000000
+      e810xxv: 58000000
 
     link:
-      10ge: 14880952.38
-      25ge: 37202380.95
-      40ge: 59523809.52
-      100ge: 148809523.81
+      10ge: 14880952
+      25ge: 37202380
+      40ge: 59523809
+      100ge: 148809523
 
     pci:
-      pci-g3-x8: 74404761.90
-      pci-g3-x16: 148809523.81
+      pci-g3-x8: 74404761
+      pci-g3-x16: 148809523
+
+  frequency:  # [GHz]
+    2n-aws: 1.000
+    2n-dnv: 2.000
+    2n-clx: 2.300
+    2n-icx: 2.600
+    2n-skx: 2.500
+    2n-tx2: 2.500
+    2n-zn2: 2.900
+    3n-alt: 3.000
+    3n-aws: 1.000
+    3n-dnv: 2.000
+    3n-icx: 2.600
+    3n-skx: 2.500
+    3n-tsh: 2.200
 
 ################################################################################
 ###                               S T A T I C                                ###