From 0e295755ebb1b76877dce06484064cc23223546a Mon Sep 17 00:00:00 2001 From: Francisco Herrera Date: Tue, 17 Mar 2026 07:10:33 -0400 Subject: [PATCH] Adding FIPS_CLUSTER variable to E2E test (#1698) Adding FIPS_CLUSTER will help us to set it to true when we run test on FIPS clusters and skip test on versions under 1.28.x Signed-off-by: Francisco Herrera --- tests/e2e/ambient/ambient_suite_test.go | 1 + tests/e2e/ambient/ambient_test.go | 5 +++++ tests/e2e/common-operator-integ-suite.sh | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/e2e/ambient/ambient_suite_test.go b/tests/e2e/ambient/ambient_suite_test.go index 393c9971be..eb73c3b982 100644 --- a/tests/e2e/ambient/ambient_suite_test.go +++ b/tests/e2e/ambient/ambient_suite_test.go @@ -38,6 +38,7 @@ var ( expectedRegistry = env.Get("EXPECTED_REGISTRY", "^docker\\.io|^gcr\\.io") multicluster = env.GetBool("MULTICLUSTER", false) keepOnFailure = env.GetBool("KEEP_ON_FAILURE", false) + fipsCluster = env.GetBool("FIPS_CLUSTER", false) k kubectl.Kubectl ) diff --git a/tests/e2e/ambient/ambient_test.go b/tests/e2e/ambient/ambient_test.go index 1409ce3e7c..7ed9e26db4 100644 --- a/tests/e2e/ambient/ambient_test.go +++ b/tests/e2e/ambient/ambient_test.go @@ -54,6 +54,11 @@ var _ = Describe("Ambient configuration ", Label("smoke", "ambient"), Ordered, f continue } + // FIPS clusters do not support ambient mode for versions below 1.28 + if fipsCluster && version.Version.LessThan(semver.MustParse("1.28.0")) { + continue + } + Context(fmt.Sprintf("Istio version %s", version.Version), func() { clr := cleaner.New(cl) BeforeAll(func(ctx SpecContext) { diff --git a/tests/e2e/common-operator-integ-suite.sh b/tests/e2e/common-operator-integ-suite.sh index e669bccb6b..6adf5c4fca 100755 --- a/tests/e2e/common-operator-integ-suite.sh +++ b/tests/e2e/common-operator-integ-suite.sh @@ -324,7 +324,7 @@ if [ "${SKIP_BUILD}" == "false" ]; then fi fi -export SKIP_DEPLOY IP_FAMILY ISTIO_MANIFEST NAMESPACE CONTROL_PLANE_NS DEPLOYMENT_NAME MULTICLUSTER ARTIFACTS ISTIO_NAME COMMAND KUBECONFIG ISTIOCTL_PATH GINKGO_FLAGS +export SKIP_DEPLOY IP_FAMILY ISTIO_MANIFEST NAMESPACE CONTROL_PLANE_NS DEPLOYMENT_NAME MULTICLUSTER ARTIFACTS ISTIO_NAME COMMAND KUBECONFIG ISTIOCTL_PATH GINKGO_FLAGS FIPS_CLUSTER if [ "${OLM}" != "true" ] && [ "${SKIP_DEPLOY}" != "true" ]; then # shellcheck disable=SC2153