e2e: Modify DoTestCreateSimplePod to support CRIO

DoTestCreateSimplePod should work with both cri-o and the default containerd runtime Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
confidential-containers · Jul 12, 2024 · df2790f · df2790f
1 parent dd84e3e
commit df2790f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/cloud-api-adaptor/test/e2e/common.go b/src/cloud-api-adaptor/test/e2e/common.go
@@ -33,6 +33,10 @@ func isTestWithKbs() bool {
 	return os.Getenv("DEPLOY_KBS") == "true" || os.Getenv("DEPLOY_KBS") == "yes"
 }
 
+func isTestOnCrio() bool {
+	return os.Getenv("CONTAINER_RUNTIME") == "crio"
+}
+
 type PodOption func(*corev1.Pod)
 
 func WithRestartPolicy(restartPolicy corev1.RestartPolicy) PodOption {

diff --git a/src/cloud-api-adaptor/test/e2e/common_suite.go b/src/cloud-api-adaptor/test/e2e/common_suite.go
@@ -27,7 +27,11 @@ var E2eNamespace = envconf.RandomName("coco-pp-e2e-test", 25)
 // DoTestCreateSimplePod tests a simple peer-pod can be created.
 func DoTestCreateSimplePod(t *testing.T, e env.Environment, assert CloudAssert) {
 	pod := NewBusyboxPodWithName(E2eNamespace, "simple-test")
-	NewTestCase(t, e, "SimplePeerPod", assert, "PodVM is created").WithPod(pod).WithNydusSnapshotter().Run()
+	if isTestOnCrio() {
+		NewTestCase(t, e, "SimplePeerPod", assert, "PodVM is created").WithPod(pod).Run()
+	} else {
+		NewTestCase(t, e, "SimplePeerPod", assert, "PodVM is created").WithPod(pod).WithNydusSnapshotter().Run()
+	}
 }
 
 func DoTestDeleteSimplePod(t *testing.T, e env.Environment, assert CloudAssert) {

diff --git a/src/cloud-api-adaptor/test/e2e/main_test.go b/src/cloud-api-adaptor/test/e2e/main_test.go
@@ -24,6 +24,10 @@ var (
 	keyBrokerService *pv.KeyBrokerService
 )
 
+const (
+	defaultContainerRuntime = "containerd"
+)
+
 func init() {
 	initLogger()
 }
@@ -123,6 +127,16 @@ func TestMain(m *testing.M) {
 			}
 		}
 
+		// Set CONTAINER_RUNTIME env variable if present in the properties
+		// Default value is containerd.
+		containerRuntime := defaultContainerRuntime
+		if props["CONTAINER_RUNTIME"] != "" {
+			containerRuntime = props["CONTAINER_RUNTIME"]
+		}
+
+		log.Infof("Container runtime: %s", containerRuntime)
+		os.Setenv("CONTAINER_RUNTIME", containerRuntime)
+
 		if shouldProvisionCluster {
 			log.Info("Cluster provisioning")
 			if err = provisioner.CreateVPC(ctx, cfg); err != nil {