Assert distro-specific probes in integration matrix tests

Author: vmg-dev

.github/workflows/ci.yml

@@ -40,14 +40,29 @@ jobs:
         include:
           - distro: alpine
             image: alpine:3.20
+            probe_path: /etc/alpine-release
+            probe_command: cat /etc/alpine-release
+            probe_expect: "3.20"
           - distro: debian
             image: debian:bookworm-slim
+            probe_path: /etc/debian_version
+            probe_command: cat /etc/debian_version
+            probe_expect: "12"
           - distro: ubuntu
             image: ubuntu:24.04
+            probe_path: /etc/os-release
+            probe_command: . /etc/os-release; echo "$ID:$VERSION_ID"
+            probe_expect: ubuntu:24.04
           - distro: fedora
             image: fedora:41
+            probe_path: /etc/fedora-release
+            probe_command: cat /etc/fedora-release
+            probe_expect: "Fedora release 41"
           - distro: archlinux
             image: archlinux:latest
+            probe_path: /etc/os-release
+            probe_command: . /etc/os-release; echo "$ID"
+            probe_expect: arch
     name: integration-tests (${{ matrix.distro }})
 
     steps:
@@ -71,9 +86,9 @@ jobs:
         env:
           INTEGRATION_PLATFORM: linux/amd64
           INTEGRATION_IMAGE: ${{ matrix.image }}
-          INTEGRATION_ROOTFS_CHECK_PATH: /bin/sh
-          INTEGRATION_VM_CHECK_COMMAND: echo integration-vm-ok
-          INTEGRATION_VM_CHECK_EXPECT: integration-vm-ok
+          INTEGRATION_ROOTFS_CHECK_PATH: ${{ matrix.probe_path }}
+          INTEGRATION_VM_CHECK_COMMAND: ${{ matrix.probe_command }}
+          INTEGRATION_VM_CHECK_EXPECT: ${{ matrix.probe_expect }}
         run: bun run test:integration
 
   e2e-smoke:

README.md

@@ -88,6 +88,8 @@ The CI integration matrix currently validates:
 - `fedora:41`
 - `archlinux:latest`
 
+For each distro row, tests run a distro-specific probe command (for example `/etc/debian_version`, `/etc/fedora-release`, etc.) and also assert that probe does **not** match on the base Gondolin guest image.
+
 ### Choosing the build platform (`--platform`)
 
 `--platform` selects which OCI image variant to convert, and should match the architecture you plan to run in Gondolin.

test/integration/oci2gondolin.integration.test.ts

@@ -20,11 +20,11 @@ type CommandOptions = {
 };
 
 const REPO_ROOT = process.cwd();
-const IMAGE = process.env.INTEGRATION_IMAGE ?? "busybox:latest";
+const IMAGE = process.env.INTEGRATION_IMAGE ?? "debian:bookworm-slim";
 const PLATFORM = resolveIntegrationPlatform(process.env.INTEGRATION_PLATFORM ?? process.arch);
-const ROOTFS_CHECK_PATH = process.env.INTEGRATION_ROOTFS_CHECK_PATH ?? "/bin/sh";
-const VM_CHECK_COMMAND = process.env.INTEGRATION_VM_CHECK_COMMAND ?? "echo integration-vm-ok";
-const VM_CHECK_EXPECT = process.env.INTEGRATION_VM_CHECK_EXPECT ?? "integration-vm-ok";
+const ROOTFS_CHECK_PATH = process.env.INTEGRATION_ROOTFS_CHECK_PATH ?? "/etc/debian_version";
+const VM_CHECK_COMMAND = process.env.INTEGRATION_VM_CHECK_COMMAND ?? "cat /etc/debian_version";
+const VM_CHECK_EXPECT = process.env.INTEGRATION_VM_CHECK_EXPECT ?? "12";
 
 const imageSlug = IMAGE.replace(/[^a-z0-9._-]+/gi, "-").toLowerCase();
 const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), `docker2vm-integration-${imageSlug}-`));
@@ -140,6 +140,8 @@ describe("oci2gondolin integration", () => {
     const originalGuestDir = process.env.GONDOLIN_GUEST_DIR;
     const vmSandbox = resolveVmSandboxOptions();
 
+    await assertProbeMissingFromBaseImage(vmSandbox, originalGuestDir);
+
     let vm: VM | null = null;
     try {
       process.env.GONDOLIN_GUEST_DIR = assetsOutDir;
@@ -194,6 +196,37 @@ function resolveVmSandboxOptions(): { accel?: "tcg"; cpu?: "max" } | undefined {
   }
 }
 
+async function assertProbeMissingFromBaseImage(
+  vmSandbox: { accel?: "tcg"; cpu?: "max" } | undefined,
+  originalGuestDir: string | undefined,
+): Promise<void> {
+  let vm: VM | null = null;
+
+  try {
+    if (originalGuestDir === undefined) {
+      delete process.env.GONDOLIN_GUEST_DIR;
+    } else {
+      process.env.GONDOLIN_GUEST_DIR = originalGuestDir;
+    }
+
+    vm = await VM.create({ sandbox: vmSandbox });
+    const baseResult = await vm.exec(["/bin/sh", "-lc", VM_CHECK_COMMAND]);
+
+    expect(baseResult.stdout).not.toContain(VM_CHECK_EXPECT);
+    expect(baseResult.stderr).not.toContain(VM_CHECK_EXPECT);
+  } finally {
+    await vm?.close().catch(() => {
+      // ignore close errors in test teardown
+    });
+
+    if (originalGuestDir === undefined) {
+      delete process.env.GONDOLIN_GUEST_DIR;
+    } else {
+      process.env.GONDOLIN_GUEST_DIR = originalGuestDir;
+    }
+  }
+}
+
 function requireBinary(binary: string, fallbacks: string[] = []): string {
   const candidates = [binary, ...fallbacks];