treewide: migrate to qemu-kvm in toolchain-bundle
Change-Id: I42a10a9adf7bdccb83ef997c6d554140ffaade4b
Reviewed-on: https://review.monogon.dev/c/monogon/+/4052
Reviewed-by: Jan Schär <jan@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/cli/takeover/e2e/BUILD.bazel b/metropolis/cli/takeover/e2e/BUILD.bazel
index d951ad8..4098904 100644
--- a/metropolis/cli/takeover/e2e/BUILD.bazel
+++ b/metropolis/cli/takeover/e2e/BUILD.bazel
@@ -4,6 +4,7 @@
name = "e2e_test",
srcs = ["main_test.go"],
data = [
+ "//build/toolchain/toolchain-bundle:qemu-kvm",
"//metropolis/cli/metroctl:metroctl_lite",
"//metropolis/cli/takeover",
"//metropolis/installer/test/testos:testos_image",
@@ -18,6 +19,7 @@
"xCloudImagePath": "$(rlocationpath @debian_11_cloudimage//file )",
"xTakeoverPath": "$(rlocationpath //metropolis/cli/takeover )",
"xMetroctlPath": "$(rlocationpath //metropolis/cli/metroctl:metroctl_lite )",
+ "xQEMUPath": "$(rlocationpath //build/toolchain/toolchain-bundle:qemu-kvm )",
},
deps = [
"//osbase/fat32",
diff --git a/metropolis/cli/takeover/e2e/main_test.go b/metropolis/cli/takeover/e2e/main_test.go
index d357d8a..419842f 100644
--- a/metropolis/cli/takeover/e2e/main_test.go
+++ b/metropolis/cli/takeover/e2e/main_test.go
@@ -38,6 +38,7 @@
xCloudImagePath string
xTakeoverPath string
xMetroctlPath string
+ xQEMUPath string
)
func init() {
@@ -45,6 +46,7 @@
for _, path := range []*string{
&xCloudImagePath, &xOvmfVarsPath, &xOvmfCodePath,
&xTakeoverPath, &xImagePath, &xMetroctlPath,
+ &xQEMUPath,
} {
*path, err = runfiles.Rlocation(*path)
if err != nil {
@@ -157,7 +159,7 @@
"-device", "virtio-rng-pci",
"-serial", "stdio",
}
- qemuCmd := exec.Command("qemu-system-x86_64", qemuArgs...)
+ qemuCmd := exec.Command(xQEMUPath, qemuArgs...)
stdoutPipe, err := qemuCmd.StdoutPipe()
if err != nil {
t.Fatal(err)