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/cloud/agent/e2e/BUILD.bazel b/cloud/agent/e2e/BUILD.bazel
index 91f09ce..ce068f8 100644
--- a/cloud/agent/e2e/BUILD.bazel
+++ b/cloud/agent/e2e/BUILD.bazel
@@ -4,6 +4,7 @@
name = "e2e_test",
srcs = ["main_test.go"],
data = [
+ "//build/toolchain/toolchain-bundle:qemu-kvm",
"//cloud/agent/takeover:initramfs",
"//metropolis/installer/test/testos:testos_image",
"//third_party/edk2:OVMF_CODE.fd",
@@ -16,6 +17,7 @@
"xOvmfCodePath": "$(rlocationpath //third_party/edk2:OVMF_CODE.fd )",
"xKernelPath": "$(rlocationpath //third_party/linux )",
"xInitramfsOrigPath": "$(rlocationpath //cloud/agent/takeover:initramfs )",
+ "xQEMUPath": "$(rlocationpath //build/toolchain/toolchain-bundle:qemu-kvm )",
},
deps = [
"//cloud/agent/api",
diff --git a/cloud/agent/e2e/main_test.go b/cloud/agent/e2e/main_test.go
index dc3108e..53b719b 100644
--- a/cloud/agent/e2e/main_test.go
+++ b/cloud/agent/e2e/main_test.go
@@ -47,13 +47,14 @@
xOvmfCodePath string
xKernelPath string
xInitramfsOrigPath string
+ xQEMUPath string
)
func init() {
var err error
for _, path := range []*string{
&xImagePath, &xOvmfVarsPath, &xOvmfCodePath,
- &xKernelPath, &xInitramfsOrigPath,
+ &xKernelPath, &xInitramfsOrigPath, &xQEMUPath,
} {
*path, err = runfiles.Rlocation(*path)
if err != nil {
@@ -277,11 +278,12 @@
"-kernel", xKernelPath,
"-initrd", initramfsFile.Name(),
"-append", "console=ttyS0 quiet")
- qemuCmdAgent := exec.Command("qemu-system-x86_64", stage1Args...)
+ qemuCmdAgent := exec.Command(xQEMUPath, stage1Args...)
qemuCmdAgent.Stdout = os.Stdout
qemuCmdAgent.Stderr = os.Stderr
qemuCmdAgent.Run()
- qemuCmdLaunch := exec.Command("qemu-system-x86_64", qemuArgs...)
+
+ qemuCmdLaunch := exec.Command(xQEMUPath, qemuArgs...)
stdoutPipe, err := qemuCmdLaunch.StdoutPipe()
if err != nil {
t.Fatal(err)