From 539a31103b534561ee04153836742d53ba6910a3 Mon Sep 17 00:00:00 2001 From: jochen Date: Fri, 23 Oct 2026 12:38:09 +0200 Subject: [PATCH] mesh-build-image: let the module's own guard decide whether the real-buildah tests run, so a check sandbox where rootless buildah cannot unshare skips them loudly instead of failing every catalogue check (issue 1894) --- .../cmd/mesh-build-image/integration_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/integration_test.go b/modules/mesh-build-image/cmd/mesh-build-image/integration_test.go index e86e8dd8..6b6d13c3 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/integration_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/integration_test.go @@ -53,6 +53,11 @@ func realModule(t *testing.T) (*Module, *keptStates) { m := &Module{Node: "ace", Account: u.Username, UID: u.Uid, Home: home, Work: t.TempDir(), Store: t.TempDir(), Steps: states.putStep, Ctx: context.Background(), Say: t.Logf, Run: StepRunner(home), FetchOptions: []buildstep.Option{buildstep.AllowFileRemote()}} + // buildah being installed is not enough: inside the check's sandbox rootless buildah cannot make its user + // namespace, so the module's own guard decides, as it does before every step (issue 1894). + if err := m.Check(context.Background()); err != nil { + t.Skipf("NOT RUN: this machine cannot build images where the check runs (%v); proven live on a build node", err) + } return m, states }