Skip to content

Commit 5bd82cb

Browse files
committed
test: Fix iso_test on arm64
Virtualbox binaries are not built in the arm64 iso. Test them only on other architectures. Example run: % go test -v ./test/integration -run TestISO -tags integration --- PASS: TestISOImage (17.74s) --- PASS: TestISOImage/Setup (17.31s) --- PASS: TestISOImage/Binaries (0.00s) --- PASS: TestISOImage/Binaries/docker (0.08s) --- PASS: TestISOImage/Binaries/podman (0.09s) --- PASS: TestISOImage/Binaries/iptables (0.10s) --- PASS: TestISOImage/Binaries/git (0.10s) --- PASS: TestISOImage/Binaries/curl (0.11s) --- PASS: TestISOImage/Binaries/crictl (0.11s) --- PASS: TestISOImage/Binaries/wget (0.06s) --- PASS: TestISOImage/Binaries/socat (0.07s) --- PASS: TestISOImage/Binaries/rsync (0.06s) --- PASS: TestISOImage/PersistentMounts (0.00s) --- PASS: TestISOImage/PersistentMounts//var/lib/boot2docker (0.08s) --- PASS: TestISOImage/PersistentMounts//var/lib/cni (0.09s) --- PASS: TestISOImage/PersistentMounts//var/lib/toolbox (0.09s) --- PASS: TestISOImage/PersistentMounts//var/lib/minikube (0.10s) --- PASS: TestISOImage/PersistentMounts//var/lib/docker (0.10s) --- PASS: TestISOImage/PersistentMounts//data (0.11s) --- PASS: TestISOImage/PersistentMounts//var/lib/kubelet (0.06s)
1 parent 7bf746b commit 5bd82cb

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

test/integration/iso_test.go

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"context"
2323
"fmt"
2424
"os/exec"
25+
"runtime"
2526
"strings"
2627
"testing"
2728

@@ -54,7 +55,24 @@ func TestISOImage(t *testing.T) {
5455

5556
// Run as a group so that our defer doesn't happen as tests are runnings
5657
t.Run("Binaries", func(t *testing.T) {
57-
for _, pkg := range []string{"git", "rsync", "curl", "wget", "socat", "iptables", "VBoxControl", "VBoxService", "crictl", "podman", "docker"} {
58+
binaries := []string{
59+
"crictl",
60+
"curl",
61+
"docker",
62+
"git",
63+
"iptables",
64+
"podman",
65+
"rsync",
66+
"socat",
67+
"wget",
68+
}
69+
70+
// virtualbox is not available in the arm64 iso.
71+
if runtime.GOARCH == "amd64" {
72+
binaries = append(binaries, "VBoxControl", "VBoxService")
73+
}
74+
75+
for _, pkg := range binaries {
5876
pkg := pkg
5977
t.Run(pkg, func(t *testing.T) {
6078
t.Parallel()

0 commit comments

Comments
 (0)