X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=39b2be4608b4d0b420fa70f6d8c084d3679abbdb;hb=refs%2Fchanges%2F92%2F34992%2F5;hp=ada2c228e6c253656a96cc17e5d3e7d73a9d9ccb;hpb=214a3bb8713ca661f4f8fef6859d17b860193dbc;p=csit.git

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index ada2c228e6..39b2be4608 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -148,7 +148,7 @@ function archive_tests () {
     set -exuo pipefail
 
     pushd "${ARCHIVE_DIR}" || die
-    tar czvf "generated_tests.tar.gz" "${GENERATED_DIR}/tests" || true
+    tar czf "generated_tests.tar.gz" "${GENERATED_DIR}/tests" || true
     popd || die
 }
 
@@ -455,18 +455,26 @@ function get_test_code () {
             NODENESS="2n"
             FLAVOR="skx"
             ;;
-        *"2n-zn2"*)
-            NODENESS="2n"
-            FLAVOR="zn2"
-            ;;
         *"3n-skx"*)
             NODENESS="3n"
             FLAVOR="skx"
             ;;
+        *"2n-zn2"*)
+            NODENESS="2n"
+            FLAVOR="zn2"
+            ;;
         *"2n-clx"*)
             NODENESS="2n"
             FLAVOR="clx"
             ;;
+        *"2n-icx"*)
+            NODENESS="2n"
+            FLAVOR="icx"
+            ;;
+        *"3n-icx"*)
+            NODENESS="3n"
+            FLAVOR="icx"
+            ;;
         *"2n-dnv"*)
             NODENESS="2n"
             FLAVOR="dnv"
@@ -619,7 +627,7 @@ function post_process_robot_outputs () {
         # We are keeping info outputs where they are.
         # Assuming we want to move anything but info files (and dirs).
         options+=("--exclude=*.info.json")
-        tar czvf "tests_output_raw.tar.gz" "${options[@]}" "tests" || true
+        tar czf "generated_output_raw.tar.gz" "${options[@]}" "tests" || true
         # Tar can remove when archiving, but chokes (not deterministically)
         # on attempting to remove dirs (not empty as info files are there).
         # So we need to delete the raw files manually.
@@ -864,6 +872,9 @@ function select_tags () {
         *"3n-tsh"*)
             default_nic="nic_intel-x520-da2"
             ;;
+        *"3n-icx"* | *"2n-icx"*)
+            default_nic="nic_intel-xxv710"
+            ;;
         *"3n-skx"* | *"2n-skx"* | *"2n-clx"* | *"2n-zn2"*)
             default_nic="nic_intel-xxv710"
             ;;
@@ -985,6 +996,14 @@ function select_tags () {
         *"2n-clx"*)
             test_tag_array+=("!ipsechw")
             ;;
+        *"2n-icx"*)
+            test_tag_array+=("!ipsechw")
+            ;;
+        *"3n-icx"*)
+            test_tag_array+=("!ipsechw")
+            # Not enough nic_intel-xxv710 to support double link tests.
+            test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710")
+            ;;
         *"2n-zn2"*)
             test_tag_array+=("!ipsechw")
             ;;
@@ -1097,10 +1116,18 @@ function select_topology () {
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
             TOPOLOGIES_TAGS="3_node_*_link_topo"
             ;;
+        "3n_icx")
+            TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_icx*.yaml )
+            TOPOLOGIES_TAGS="3_node_*_link_topo"
+            ;;
         "2n_clx")
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx*.yaml )
             TOPOLOGIES_TAGS="2_node_*_link_topo"
             ;;
+        "2n_icx")
+            TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_icx*.yaml )
+            TOPOLOGIES_TAGS="2_node_*_link_topo"
+            ;;
         "2n_dnv")
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_dnv*.yaml )
             TOPOLOGIES_TAGS="2_node_single_link_topo"