From 62adc45ffe7a02f750de94d7dc77f75496e0cef9 Mon Sep 17 00:00:00 2001
From: Charlie <5764343+charlielye@users.noreply.github.com>
Date: Tue, 9 Jun 2026 16:50:50 +0000
Subject: [PATCH] feat(ci3): give single-instance PR runs a parent dashboard
 log
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-queue runs route through `multi_job_run`, which pipes the runner-side
orchestration into a parent dashboard log (`cache_log "CI run" $RUN_ID`) — so
the spot/instance request is visible on ci.aztec-labs.com. Single-instance PR
modes called `bootstrap_ec2` directly, so that output only reached the GitHub
Actions console; you had to leave the dashboard to see which instance was
created.

Route the PR-facing single-instance modes (fast/docs/barretenberg/
barretenberg-full, full/full-no-test-cache, chonk-input-update) through
`multi_job_run` with a single job, matching merge-queue. The job id is kept as
`x-$cmd` so the `ci/<job>` GitHub status check name is unchanged. socket-fix
keeps its raw (un-denoised) output but now pipes through `cache_log` so it too
gets a parent log.
---
 ci.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ci.sh b/ci.sh
index 26b0dfecb105..316abf4c6d86 100755
--- a/ci.sh
+++ b/ci.sh
@@ -112,27 +112,30 @@ case "$cmd" in
     ;;
   fast|docs|barretenberg|barretenberg-full)
     export CI_DASHBOARD="prs"
-    export JOB_ID="x-$cmd"
-    bootstrap_ec2 "./bootstrap.sh ci-$cmd"
+    # Route through multi_job_run (even for a single instance) so the runner-side
+    # orchestration — including the spot/instance request — is captured into a
+    # parent dashboard log, matching merge-queue. The job id stays "x-$cmd" so the
+    # GitHub status check name is unchanged.
+    multi_job_run "x-$cmd amd64 ci-$cmd"
     ;;
   socket-fix)
     export CI_DASHBOARD="prs"
     export JOB_ID="x-socket-fix"
     export INSTANCE_POSTFIX="socket-fix"
     export CPUS=16
-    bootstrap_ec2 "./bootstrap.sh ci-socket-fix $*"
+    # Capture the runner-side output (incl. instance request) to a parent dashboard
+    # log. No denoise here: this is an interactive debug mode where raw output matters.
+    PARENT_LOG_ID=$RUN_ID bootstrap_ec2 "./bootstrap.sh ci-socket-fix $*" 2>&1 | DUP=1 cache_log "CI run" $RUN_ID
     ;;
   full|full-no-test-cache)
     export CI_DASHBOARD="prs"
-    export JOB_ID="x-$cmd"
     export AWS_SHUTDOWN_TIME=75
-    bootstrap_ec2 "./bootstrap.sh ci-$cmd"
+    multi_job_run "x-$cmd amd64 ci-$cmd"
     ;;
   chonk-input-update)
     export CI_DASHBOARD="prs"
-    export JOB_ID="x-$cmd"
     export AWS_SHUTDOWN_TIME=90
-    bootstrap_ec2 "./bootstrap.sh ci-chonk-input-update"
+    multi_job_run "x-$cmd amd64 ci-chonk-input-update"
     ;;
   barretenberg-debug)
     export CI_DASHBOARD="nightly"