2 files changed, 24 insertions, 16 deletions
diff --git a/internal/workflows/step.go b/internal/workflows/step.go
index d09e047e..c0138926 100644
--- a/internal/workflows/step.go
+++ b/internal/workflows/step.go
@@ -2,6 +2,13 @@
 
 package main
 
+// fixup is a step to work around a Podman regression introduced by a bad
+// container escape mitigation.
+var fixup = Step{
+	Name: "Fix container filesystem",
+	Run:  "rm /var/run && ln -sf ../run /var",
+}
+
 // checkout is the standard actions/checkout step.
 var checkout = Step{Name: "Checkout", Uses: "actions/checkout@v4"}
 
@@ -21,6 +28,18 @@ func newUploadArtifact(display, name string) Step {
 	}
 }
 
+// newCIRequest returns a step for requesting a mbf CI task.
+func newCIRequest(display, name, id string) Step {
+	return Step{
+		Name: "Request " + display,
+		ID:   id,
+		Run: "export HAKUREI_REV=\"$(git rev-parse --short HEAD)\" && " +
+			"/rosa/bin/mbf ci " + name + " " +
+			". \"$(cat cmd/dist/VERSION)-$HAKUREI_REV\" && " +
+			"echo \"rev=$HAKUREI_REV\" >> \"$GITHUB_OUTPUT\"",
+	}
+}
+
 // newNixOSTest returns a step for running the named NixOS test.
 func newNixOSTest(name string) Step {
 	return Step{
diff --git a/internal/workflows/test.go b/internal/workflows/test.go
index a6a2abc9..9ccea1dc 100644
--- a/internal/workflows/test.go
+++ b/internal/workflows/test.go
@@ -89,26 +89,15 @@ var _ = (&Workflow{
 
 		{K: "dist", V: Job{
 			Name: "Create distribution",
-			On:   "nix",
+			On:   "rosa",
 
 			Steps: []Step{
+				fixup,
 				checkout,
-
-				{
-					Name: "Build for test",
-					ID:   "build-test",
-					Run: "export HAKUREI_REV=\"$(git rev-parse --short HEAD)\" && " +
-						"sed -i.old " +
-						"'s/version = /version = \"0.0.0-'$HAKUREI_REV'\"; # version = /' " +
-						"test/package.nix && " +
-						"nix build --print-out-paths --print-build-logs ./test#dist && " +
-						"mv test/{package.nix.old,package.nix} && " +
-						"echo \"rev=$HAKUREI_REV\" >> $GITHUB_OUTPUT",
-				},
-
+				newCIRequest("distribution", "dist -o result", "dist-test"),
 				newUploadArtifact(
-					"test build",
-					"hakurei-${{ steps.build-test.outputs.rev }}",
+					"distribution",
+					"hakurei-${{ steps.dist-test.outputs.rev }}",
 				),
 			},
 		}},