Merge pull request #23123 from baude/libkruntest

Small fixes for testing libkrun
containers · Jul 2, 2024 · 3b07ae4 · 3b07ae4
2 parents f5d50a6 + d2ca205
commit 3b07ae4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pkg/machine/e2e/machine_test.go b/pkg/machine/e2e/machine_test.go
@@ -62,10 +62,16 @@ var _ = BeforeSuite(func() {
 	if testProvider.VMType() == define.WSLVirt {
 		pullError = pullWSLDisk()
 	} else {
-		pullError = pullOCITestDisk(tmpDir, testProvider.VMType())
+		// This is a one-off and a little messy but once WSL switches
+		// to use OCI disk artifacts, we can make all the conditionals cleaner.
+		testDiskProvider := testProvider.VMType()
+		if testDiskProvider == define.LibKrun {
+			testDiskProvider = define.AppleHvVirt // libkrun uses the applehv image for testing
+		}
+		pullError = pullOCITestDisk(tmpDir, testDiskProvider)
 	}
 	if pullError != nil {
-		Fail(fmt.Sprintf("failed to pull wsl disk: %q", pullError))
+		Fail(fmt.Sprintf("failed to pull disk: %q", pullError))
 	}
 })
 

diff --git a/pkg/machine/shim/host.go b/pkg/machine/shim/host.go
@@ -126,12 +126,14 @@ func Init(opts machineDefine.InitOptions, mp vmconfigs.VMProvider) error {
 	switch mp.VMType() {
 	case machineDefine.QemuVirt:
 		imageExtension = ".qcow2"
-	case machineDefine.AppleHvVirt:
+	case machineDefine.AppleHvVirt, machineDefine.LibKrun:
 		imageExtension = ".raw"
 	case machineDefine.HyperVVirt:
 		imageExtension = ".vhdx"
+	case machineDefine.WSLVirt:
+		imageExtension = ""
 	default:
-		// do nothing
+		return fmt.Errorf("unknown VM type: %s", mp.VMType())
 	}
 
 	imagePath, err = dirs.DataDir.AppendToNewVMFile(fmt.Sprintf("%s-%s%s", opts.Name, runtime.GOARCH, imageExtension), nil)