Run conformance for 1.29 and above in default mode (#8576)

aws · Aug 7, 2024 · 3023283 · 3023283
1 parent 9e1f935
commit 3023283
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/executables/sonobuoy.go b/pkg/executables/sonobuoy.go
@@ -27,7 +27,6 @@ func (k *Sonobuoy) Run(ctx context.Context, contextName string, args ...string)
 		"--context",
 		contextName,
 		"run",
-		"--mode=certified-conformance",
 		"--wait",
 	}
 	executionArgs = append(executionArgs, args...)

diff --git a/test/framework/conformance.go b/test/framework/conformance.go
@@ -61,6 +61,11 @@ func (e *ClusterE2ETest) RunConformanceTests() {
 	// 3. https://github.com/cncf/k8s-conformance/pull/3049
 	if k8s129Compare != -1 {
 		args = append(args, fmt.Sprintf("--e2e-skip='%s'", skippedTestName))
+	} else {
+		// Only mode or --e2e-skip can be used at a time. Because we are using --e2e-skip
+		// for k8s 1.29 and higher, we need to skip --mode=certified-conformance for those versions.
+		// Once we stop skipping e2e, we can add the mode back to k8s 1.29 and higher.
+		args = append(args, "--mode=certified-conformance")
 	}
 	e.T.Logf("Running k8s conformance tests with Image: %s", kubeConformanceImageTagged)
 	output, err := conformance.RunTests(ctx, contextName, args...)