[OSSM-6747] Update log message in OSSM 2.6 for TestPluginCaCert test (#…

…697)
maistra · Jun 27, 2024 · 6558d91 · 6558d91
1 parent b6da4f7
commit 6558d91
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/pkg/tests/tasks/security/certmanager/plugin_ca_test.go b/pkg/tests/tasks/security/certmanager/plugin_ca_test.go
@@ -66,12 +66,22 @@ func TestPluginCaCert(t *testing.T) {
 		oc.WaitSMCPReady(t, meshNamespace, smcpName)
 
 		t.LogStep("Verify that cacerts secret was detected")
-		retry.UntilSuccess(t, func(t test.TestHelper) {
-			oc.Logs(t, pod.MatchingSelector("app=istiod", meshNamespace), "discovery", assert.OutputContains(
-				"Use plugged-in cert at etc/cacerts/tls.key",
-				"Istiod detected cacerts secret correctly",
-				"Istiod did not detect cacerts secret"))
-		})
+
+		if env.GetSMCPVersion().LessThan(version.SMCP_2_6) {
+			retry.UntilSuccess(t, func(t test.TestHelper) {
+				oc.Logs(t, pod.MatchingSelector("app=istiod", meshNamespace), "discovery", assert.OutputContains(
+					"Use plugged-in cert at etc/cacerts/tls.key",
+					"Istiod detected cacerts secret correctly",
+					"Istiod did not detect cacerts secret"))
+			})
+		} else {
+			retry.UntilSuccess(t, func(t test.TestHelper) {
+				oc.Logs(t, pod.MatchingSelector("app=istiod", meshNamespace), "discovery", assert.OutputContains(
+					"DNS certs use plugged-in cert at etc/cacerts/tls.key",
+					"Istiod detected cacerts secret correctly",
+					"Istiod did not detect cacerts secret"))
+			})
+		}
 
 		t.LogStep("Deploy httpbin and sleep")
 		app.InstallAndWaitReady(t, app.Httpbin(ns.Foo), app.Sleep(ns.Foo))