X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=228be2bfa11ed71c4aa3d54d54a7fbe394997da5;hp=e40838995eca7e4da0b51d4a7b517d64e9ab2513;hb=cb852e05b931f6757e5af9e95809c5f57ab7b2de;hpb=f10083cf1404d80e79b3be325757c2b047aa6df2 diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index e40838995e..228be2bfa1 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -455,14 +455,6 @@ function get_test_code () { NODENESS="3n" FLAVOR="aws" ;; - *"2n-skx"*) - NODENESS="2n" - FLAVOR="skx" - ;; - *"3n-skx"*) - NODENESS="3n" - FLAVOR="skx" - ;; *"2n-zn2"*) NODENESS="2n" FLAVOR="zn2" @@ -891,7 +883,7 @@ function select_tags () { *"3n-icx"* | *"2n-icx"*) default_nic="nic_intel-xxv710" ;; - *"3n-skx"* | *"2n-skx"* | *"2n-clx"* | *"2n-zn2"*) + *"2n-clx"* | *"2n-zn2"*) default_nic="nic_intel-xxv710" ;; *"2n-tx2"* | *"3n-alt"* | *"mrr-daily-master") @@ -1001,14 +993,6 @@ function select_tags () { *"1n_tx2"*) test_tag_array+=("!flow") ;; - *"2n-skx"*) - test_tag_array+=("!ipsechw") - ;; - *"3n-skx"*) - 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-clx"*) test_tag_array+=("!ipsechw") ;;