Enable cluster local TLS tests for Contour (#15378)

* enable cluster local tls tests for contour * include more tests for contour
knative · Jul 12, 2024 · 44a5d78 · 44a5d78
1 parent 63a741d
commit 44a5d78
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/test/e2e/clusterlocaldomaintls/cluster_local_domain_tls_test.go b/test/e2e/clusterlocaldomaintls/cluster_local_domain_tls_test.go
@@ -46,8 +46,9 @@ func TestClusterLocalDomainTLSClusterLocalVisibility(t *testing.T) {
 		t.Skip("Alpha features not enabled")
 	}
 
-	if !(strings.Contains(test.ServingFlags.IngressClass, "kourier")) {
-		t.Skip("Skip this test for non-kourier ingress.")
+	if !strings.Contains(test.ServingFlags.IngressClass, "kourier") &&
+		!strings.Contains(test.ServingFlags.IngressClass, "contour") {
+		t.Skip("Skip this test for non-kourier/contour ingress.")
 	}
 
 	t.Parallel()
@@ -96,8 +97,9 @@ func TestClusterLocalDomainTLSClusterExternalVisibility(t *testing.T) {
 		t.Skip("Alpha features not enabled")
 	}
 
-	if !(strings.Contains(test.ServingFlags.IngressClass, "kourier")) {
-		t.Skip("Skip this test for non-kourier ingress.")
+	if !strings.Contains(test.ServingFlags.IngressClass, "kourier") &&
+		!strings.Contains(test.ServingFlags.IngressClass, "contour") {
+		t.Skip("Skip this test for non-kourier/contour ingress.")
 	}
 
 	t.Parallel()

diff --git a/test/e2e/systeminternaltls/system_internal_tls_test.go b/test/e2e/systeminternaltls/system_internal_tls_test.go
@@ -51,9 +51,8 @@ func TestSystemInternalTLS(t *testing.T) {
 		t.Skip("Alpha features not enabled")
 	}
 
-	if !strings.Contains(test.ServingFlags.IngressClass, "kourier") ||
-		strings.Contains(test.ServingFlags.IngressClass, "contour") {
-
+	if !strings.Contains(test.ServingFlags.IngressClass, "kourier") &&
+		!strings.Contains(test.ServingFlags.IngressClass, "contour") {
 		t.Skip("Skip this test for non-kourier/contour ingress.")
 	}
 
@@ -118,8 +117,9 @@ func TestTLSCertificateRotation(t *testing.T) {
 		t.Skip("Alpha features not enabled")
 	}
 
-	if !(strings.Contains(test.ServingFlags.IngressClass, "kourier")) {
-		t.Skip("Skip this test for non-kourier ingress.")
+	if !strings.Contains(test.ServingFlags.IngressClass, "kourier") &&
+		!strings.Contains(test.ServingFlags.IngressClass, "contour") {
+		t.Skip("Skip this test for non-kourier/contour ingress.")
 	}
 
 	t.Parallel()