fix: Fix broken parent logs links. (#19435)

As title.

Author: AztecBot

ci.sh

@@ -63,7 +63,6 @@ function get_latest_run_id {
 
 # Jobs in the ci dashboards are grouped on a single line by RUN_ID.
 export RUN_ID=${RUN_ID:-$(date +%s%3N)}
-export PARENT_LOG_URL=http://ci.aztec-labs.com/$RUN_ID
 
 case "$cmd" in
   dash)
@@ -101,9 +100,10 @@ case "$cmd" in
     export DENOISE=1
     export DENOISE_WIDTH=32
     run() {
-      JOB_ID=$1 INSTANCE_POSTFIX=$1 ARCH=$2 exec denoise "bootstrap_ec2 './bootstrap.sh $3'"
+      PARENT_LOG_ID=$RUN_ID JOB_ID=$1 INSTANCE_POSTFIX=$1 ARCH=$2 exec denoise "bootstrap_ec2 './bootstrap.sh $3'"
     }
     export -f run
+
     parallel --jobs 10 --termseq 'TERM,10000' --tagstring '{= $_=~s/run (\w+).*/$1/; =}' --line-buffered --halt now,fail=1 ::: \
       'run x1-full amd64 ci-full-no-test-cache' \
       'run x2-full amd64 ci-full-no-test-cache' \
@@ -157,13 +157,14 @@ case "$cmd" in
     export DENOISE=1
     export DENOISE_WIDTH=32
     run() {
-      JOB_ID=$1 INSTANCE_POSTFIX=$1 ARCH=$2 exec denoise "bootstrap_ec2 './bootstrap.sh ci-release'"
+      PARENT_LOG_ID=$RUN_ID JOB_ID=$1 INSTANCE_POSTFIX=$1 ARCH=$2 exec denoise "bootstrap_ec2 './bootstrap.sh ci-release'"
     }
     export -f run
-    # We need to run the release flow on both x86 and arm64.
+
     parallel --termseq 'TERM,10000' --tagstring '{= $_=~s/run (\w+).*/$1/; =}' --line-buffered --halt now,fail=1 ::: \
       'run x-release amd64' \
       'run a-release arm64' | DUP=1 cache_log "Release CI run" $RUN_ID
+
     # If we were triggered by a PR with ci-release-pr label, remove the label now we've succeeded.
     if [ -n "${PR_NUMBER:-}" ]; then
       gh pr edit $PR_NUMBER --remove-label ci-release-pr || true

ci3/bootstrap_ec2

@@ -111,7 +111,7 @@ if [ -t 1 ]; then
   fi
 else
   # We're probably running in CI. Handle aws evictions and add timestamps to the logs.
-  run_cmd="run 2>&1 | ci3/add_timestamps | DUP=1 ci3/cache_log 'CI run' \$ci_log_id"
+  run_cmd="PARENT_LOG_ID=\$ci_log_id run 2>&1 | ci3/add_timestamps | DUP=1 ci3/cache_log 'CI run' \$ci_log_id"
 fi
 
 container_script=$(
@@ -137,7 +137,6 @@ container_script=$(
   source ci3/source_redis
   source ci3/source_cache
   ci_log_id=\$(log_ci_run)
-  export PARENT_LOG_URL=${PARENT_LOG_URL:-}
 
   if [ -n "\$DOCKERHUB_PASSWORD" ]; then
     echo \$DOCKERHUB_PASSWORD | docker login -u \$DOCKERHUB_USERNAME --password-stdin
@@ -280,7 +279,7 @@ function run {
         -e REF_NAME=${REF_NAME:-} \
         -e TARGET_BRANCH=${TARGET_BRANCH:-} \
         -e CI_DASHBOARD=${CI_DASHBOARD:-} \
-        -e PARENT_LOG_URL=${PARENT_LOG_URL:-} \
+        -e PARENT_LOG_ID=${PARENT_LOG_ID:-} \
         -e NO_CACHE=${NO_CACHE:-} \
         -e NO_FAIL_FAST=${NO_FAIL_FAST:-} \
         -e CI_USE_BUILD_INSTANCE_KEY=${CI_USE_BUILD_INSTANCE_KEY:-} \

ci3/cache_log

@@ -9,10 +9,15 @@ source $ci3/source_cache
 name=$1
 
 key=${2:-$(uuid)}
-outfile=/tmp/$key
 dup=${DUP:-0}
+outfile=/tmp/$key
+touch $outfile
 trap 'rm -f $outfile' EXIT
-echo -e "Parent Log: ${PARENT_LOG_URL:-none}" >$outfile
+if [ -n "${PARENT_LOG_ID:-}" ]; then
+  echo -e "Parent Log: $(ci_term_link $PARENT_LOG_ID)" >>$outfile
+else
+  echo -e "Parent Log: none" >>$outfile
+fi
 echo -e "Started: $(date)" >>$outfile
 echo -e "Completed: in-progress" >>$outfile
 echo -e "Took: in-progress\n" >>$outfile

ci3/denoise

@@ -56,7 +56,9 @@ outfile=/tmp/$key
 touch $outfile
 
 function format_log_output {
-  echo "Parent Log: ${PARENT_LOG_URL:-none}"
+  if [ -n "${PARENT_LOG_ID:-}" ]; then
+    echo -e "Parent Log: $(ci_term_link $PARENT_LOG_ID)"
+  fi
   echo "Command: $cmd"
   echo "Date: $(date)"
   echo "Status: $status"
@@ -107,7 +109,7 @@ tail --sleep-interval=0.2 -n +1 -f "$outfile" > >(
 tail_pid=$!
 
 # Execute the command in background.
-PARENT_LOG_URL=$url bash -c "$cmd" 2>&1 | redact > $outfile &
+PARENT_LOG_ID=$key bash -c "$cmd" 2>&1 | redact > $outfile &
 job_pid=$!
 
 # Wait for the job to finish and get its exit status.

ci3/filter_cached_test_cmd

@@ -22,7 +22,7 @@ function process_batch {
     if [ -z "${results[$i]}" ] || [[ "${lines[$i]}" == *disabled-cache* ]]; then
       echo "${lines[$i]}"
     else
-      echo -e "${blue}SKIPPED${reset} (${yellow}$(ci_term_link ${results[$i]})${reset}): ${lines[$i]}" >&3
+      echo -e "${blue}SKIPPED${reset} ($(ci_term_link ${results[$i]})): ${lines[$i]}" >&3
     fi
   done
 }

ci3/run_test_cmd

@@ -51,7 +51,7 @@ test_hash=$(hash_str_orig "$test_cmd")
 if [ "${USE_TEST_CACHE:-0}" -eq 1 ]; then
   log_key=$(redis_cli GET $key)
   if [ -n "$log_key" ]; then
-    log_info=" (${yellow}$(ci_term_link $log_key)${reset})"
+    log_info=" ($(ci_term_link $log_key))"
     echo -e "${blue}SKIPPED${reset}${log_info:-}: $cmd"
     exit 0
   fi
@@ -84,9 +84,13 @@ trap sig_handler SIGTERM SIGINT
 # We cannot use "output=$(timeout ...)" here as it stymies proper signal propagation.
 # To ensure we can propagate SIGTERM to timeouts process group we use a temp file and forward the signal.
 tmp_file=/tmp/$key
+touch $tmp_file
+
 # Print test metadata header.
-cat <<EOF >$tmp_file
-Parent Log: ${PARENT_LOG_URL:-none}
+if [ -n "${PARENT_LOG_ID:-}" ]; then
+  echo -e "Parent Log: $(ci_term_link $PARENT_LOG_ID)" >>$tmp_file
+fi
+cat <<EOF >>$tmp_file
 Command: $cmd
 Commit: https://github.com/AztecProtocol/aztec-packages/commit/$COMMIT_HASH
 Env: REF_NAME=$REF_NAME CURRENT_VERSION=$CURRENT_VERSION CI_FULL=$CI_FULL
@@ -129,7 +133,7 @@ function live_publish_log {
 
 if [ "$CI_REDIS_AVAILABLE" -eq 1 ]; then
   log_key=$(uuid)
-  log_info=" (${yellow}$(ci_term_link $log_key)${reset})"
+  log_info=" ($(ci_term_link $log_key))"
 
   if [ "$CI" -eq 1 ]; then
     # If we're in CI, we want to publish the log live.

ci3/source_color

@@ -29,7 +29,7 @@ export link_open='\033]8;;'
 export link_close='\x07'
 
 function term_link {
-  echo -e "${link_open}$1${link_close}$2${link_open}${link_close}"
+  echo -e "${yellow}${link_open}$1${link_close}$2${link_open}${link_close}${reset}"
 }
 
 function ci_term_link {
@@ -41,7 +41,7 @@ function pr_link {
   if [[ $line =~ \(#([0-9]+)\) ]]; then
     pr_number="${BASH_REMATCH[1]}"
     link=$(term_link https://github.com/aztecprotocol/aztec-packages/pull/$pr_number $pr_number)
-    echo -e "${line/\(#${pr_number}\)/(#${yellow}${link}${reset})}"
+    echo -e "${line/\(#${pr_number}\)/(#${link})}"
   else
     echo -e "$line"
   fi