Use IP_FAMILIES env for docs test (istio#16174)

* Use IP_FAMILIES env for docs test Signed-off-by: Faseela K <[email protected]> * fix helm install failure Signed-off-by: Faseela K <[email protected]> --------- Signed-off-by: Faseela K <[email protected]>
windsonsea · Jan 16, 2025 · 528bcaf · 528bcaf
1 parent 01e6619
commit 528bcaf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/prow/integ-suite-kind.sh b/prow/integ-suite-kind.sh
@@ -104,7 +104,15 @@ if [ -n "${PULL_NUMBER:-}" ]; then
   fi
 fi
 
-export IP_FAMILY="${IP_FAMILY:-ipv4}"
+# Default IP family of the cluster is IPv4
+KIND_IP_FAMILY="ipv4"
+export IP_FAMILIES="${IP_FAMILIES:-IPv4}"
+if [[ "$IP_FAMILIES" == "IPv6" ]]; then
+   KIND_IP_FAMILY="ipv6"
+elif [[ "$IP_FAMILIES" =~ "IPv6" ]] && [[ "$IP_FAMILIES" =~ "IPv4" ]]; then
+   KIND_IP_FAMILY="dual"
+fi
+export KIND_IP_FAMILY
 export NODE_IMAGE="gcr.io/istio-testing/kind-node:v1.31.0"
 
 if [[ -z "${SKIP_SETUP:-}" ]]; then
@@ -116,7 +124,7 @@ if [[ -z "${SKIP_SETUP:-}" ]]; then
     time setup_kind_cluster "istio-testing" "${NODE_IMAGE}"
   else
     time load_cluster_topology "${CLUSTER_TOPOLOGY_CONFIG_FILE}"
-    time setup_kind_clusters "${NODE_IMAGE}" "${IP_FAMILY}"
+    time setup_kind_clusters "${NODE_IMAGE}" "${KIND_IP_FAMILY}"
 
     export TEST_ENV=kind-metallb
     export DOCTEST_KUBECONFIG

diff --git a/tests/util/verify.sh b/tests/util/verify.sh
@@ -135,7 +135,7 @@ __cmp_like() {
     local ipregex="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$"
     local durationregex="^([0-9]+[smhd])+$"
     local versionregex="^[0-9]+\.[0-9]+\.[0-9]+$"
-    local dateregex="^\d{4}\-(0?[1-9]|1[012])\-(0?[1-9]|[12][0-9]|3[01])$"
+    local dateregex="^[0-9]{4}\-(0?[1-9]|1[012])\-(0?[1-9]|[12][0-9]|3[01])$"
     local timeregex="^(2[0-3]|[01]?[0-9]):([0-5]?[0-9]):([0-5]?[0-9]).[0-9]+$"
 
     if [[ "$out" != "$expected" ]]; then