test/e2e: new container_runtime property for libvirt

Commit a0247ae introduced a new parameter (CONTAINER_RUNTIME) for docker provider, allowing users to specify the container runtime used. Some tests will take decisions based on that property, for example, whether nydus snapshotter messages should be inspected or not. This added the handler for that property for libvirt, so that peer-pods be tested with cri-o too. Fixes confidential-containers#1981 Signed-off-by: Wainer dos Santos Moschetta <[email protected]>
wainersm · Sep 27, 2024 · 1a91d70 · 1a91d70
1 parent 71b2c67
commit 1a91d70
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 27 deletions.
diff --git a/src/cloud-api-adaptor/test/e2e/README.md b/src/cloud-api-adaptor/test/e2e/README.md
@@ -150,6 +150,7 @@ Use the properties on the table below for Libvirt:
 
 |Property|Description|Default|
 |---|---|---|
+|container_runtime|Test cluster configured container runtime. Either **containerd** or **crio** |containerd|
 |libvirt_network|Libvirt Network|"default"|
 |libvirt_storage|Libvirt storage pool|"default"|
 |libvirt_vol_name|Volume name|"podvm-base.qcow2"|

diff --git a/src/cloud-api-adaptor/test/provisioner/libvirt/provision_common.go b/src/cloud-api-adaptor/test/provisioner/libvirt/provision_common.go
@@ -21,16 +21,17 @@ import (
 
 // LibvirtProvisioner implements the CloudProvisioner interface for Libvirt.
 type LibvirtProvisioner struct {
-	conn          *libvirt.Connect // Libvirt connection
-	network       string           // Network name
-	ssh_key_file  string           // SSH key file used to connect to Libvirt
-	storage       string           // Storage pool name
-	uri           string           // Libvirt URI
-	wd            string           // libvirt's directory path on this repository
-	volumeName    string           // Podvm volume name
-	clusterName   string           // Cluster name
-	kbs_image     string           // KBS Service OCI Image URL
-	kbs_image_tag string           // KBS Service OCI Image Tag
+	conn             *libvirt.Connect // Libvirt connection
+	containerRuntime string           // Either containerd or crio
+	network          string           // Network name
+	ssh_key_file     string           // SSH key file used to connect to Libvirt
+	storage          string           // Storage pool name
+	uri              string           // Libvirt URI
+	wd               string           // libvirt's directory path on this repository
+	volumeName       string           // Podvm volume name
+	clusterName      string           // Cluster name
+	kbs_image        string           // KBS Service OCI Image URL
+	kbs_image_tag    string           // KBS Service OCI Image Tag
 }
 
 // LibvirtInstallOverlay implements the InstallOverlay interface
@@ -77,6 +78,11 @@ func NewLibvirtProvisioner(properties map[string]string) (pv.CloudProvisioner, e
 		return nil, err
 	}
 
+	container_runtime := pv.DEFAULT_CONTAINER_RUNTIME
+	if properties["container_runtime"] != "" {
+		container_runtime = properties["container_runtime"]
+	}
+
 	clusterName := "peer-pods"
 	if properties["cluster_name"] != "" {
 		clusterName = properties["cluster_name"]
@@ -94,16 +100,17 @@ func NewLibvirtProvisioner(properties map[string]string) (pv.CloudProvisioner, e
 
 	// TODO: Check network and storage are not nil?
 	return &LibvirtProvisioner{
-		conn:          conn,
-		network:       network,
-		ssh_key_file:  ssh_key_file,
-		storage:       storage,
-		uri:           uri,
-		wd:            wd,
-		volumeName:    vol_name,
-		clusterName:   clusterName,
-		kbs_image:     kbs_image,
-		kbs_image_tag: kbs_image_tag,
+		conn:             conn,
+		containerRuntime: container_runtime,
+		network:          network,
+		ssh_key_file:     ssh_key_file,
+		storage:          storage,
+		uri:              uri,
+		wd:               wd,
+		volumeName:       vol_name,
+		clusterName:      clusterName,
+		kbs_image:        kbs_image,
+		kbs_image_tag:    kbs_image_tag,
 	}, nil
 }
 
@@ -203,13 +210,14 @@ func (l *LibvirtProvisioner) DeleteVPC(ctx context.Context, cfg *envconf.Config)
 
 func (l *LibvirtProvisioner) GetProperties(ctx context.Context, cfg *envconf.Config) map[string]string {
 	return map[string]string{
-		"network":       l.network,
-		"podvm_volume":  l.volumeName,
-		"ssh_key_file":  l.ssh_key_file,
-		"storage":       l.storage,
-		"uri":           l.uri,
-		"KBS_IMAGE":     l.kbs_image,
-		"KBS_IMAGE_TAG": l.kbs_image_tag,
+		"CONTAINER_RUNTIME": l.containerRuntime,
+		"network":           l.network,
+		"podvm_volume":      l.volumeName,
+		"ssh_key_file":      l.ssh_key_file,
+		"storage":           l.storage,
+		"uri":               l.uri,
+		"KBS_IMAGE":         l.kbs_image,
+		"KBS_IMAGE_TAG":     l.kbs_image_tag,
 	}
 }
 

diff --git a/src/cloud-api-adaptor/test/provisioner/provision.go b/src/cloud-api-adaptor/test/provisioner/provision.go
@@ -36,6 +36,8 @@ type CloudProvisioner interface {
 	UploadPodvm(imagePath string, ctx context.Context, cfg *envconf.Config) error
 }
 
+const DEFAULT_CONTAINER_RUNTIME = "containerd"
+
 type NewProvisionerFunc func(properties map[string]string) (CloudProvisioner, error)
 
 // KbsInstallOverlay implements the InstallOverlay interface