From 7fe10c98318c2cb26b8d0b69f77e36ec460ad313 Mon Sep 17 00:00:00 2001
From: Hari Om <hari.om2@ibm.com>
Date: Fri, 15 May 2026 13:17:47 +0530
Subject: [PATCH] feat: enhance health check and packer binary handling in SBOM
 case matrix script

---
 scripts/run-sbom-case-matrix.sh | 40 ++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/scripts/run-sbom-case-matrix.sh b/scripts/run-sbom-case-matrix.sh
index 5c2a5ae31..eda7b25a1 100755
--- a/scripts/run-sbom-case-matrix.sh
+++ b/scripts/run-sbom-case-matrix.sh
@@ -3,13 +3,26 @@
 set -u -o pipefail
 
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-PACKER_BIN="${PACKER_BIN:-$ROOT_DIR/bin/packer}"
 TEMPLATE_DIR="${TEMPLATE_DIR:-$ROOT_DIR/examples/hcl/sbom-test}"
 LOG_DIR="${LOG_DIR:-/tmp/packer-sbom-cases/logs}"
 RELEASE_SERVER="${RELEASE_SERVER:-http://localhost:3231}"
+HEALTH_CHECK_TIMEOUT="${HEALTH_CHECK_TIMEOUT:-20}"
+
+host_os="$(uname -s | tr '[:upper:]' '[:lower:]')"
+host_arch_raw="$(uname -m)"
+case "$host_arch_raw" in
+  x86_64) host_arch="amd64" ;;
+  aarch64|arm64) host_arch="arm64" ;;
+  i386|i686) host_arch="386" ;;
+  *) host_arch="$host_arch_raw" ;;
+esac
+
+default_packer_bin="$ROOT_DIR/pkg/${host_os}_${host_arch}/packer"
+PACKER_BIN="${PACKER_BIN:-$default_packer_bin}"
 
 if [[ ! -x "$PACKER_BIN" ]]; then
   echo "error: packer binary not executable: $PACKER_BIN" >&2
+  echo "hint: build binaries into pkg/ first, or set PACKER_BIN explicitly." >&2
   exit 1
 fi
 
@@ -31,25 +44,37 @@ if [[ -z "$version" ]]; then
 fi
 
 sums_url="$RELEASE_SERVER/packer/$version/packer_${version}_SHA256SUMS"
+health_url="$RELEASE_SERVER/packer/$version/packer_${version}_${host_os}_${host_arch}.zip"
 
 start_local_release_server() {
   if [[ "$RELEASE_SERVER" != "http://localhost:3231" && "$RELEASE_SERVER" != "http://127.0.0.1:3231" ]]; then
     return
   fi
 
-  if curl -sS --max-time 3 "$sums_url" >/dev/null 2>&1; then
+  if curl -sS --max-time "$HEALTH_CHECK_TIMEOUT" "$health_url" >/dev/null 2>&1; then
     return
   fi
 
+  # If something is listening on 3231 but health checks fail, do not start
+  # another server; fail fast with a clear message.
+  local listeners
+  listeners="$(lsof -nP -iTCP:3231 -sTCP:LISTEN 2>/dev/null || true)"
+  if [[ -n "$listeners" ]]; then
+    echo "error: port 3231 is already in use, but $health_url is not responding." | tee -a "$MASTER_LOG" >&2
+    echo "error: stop the existing listener or set RELEASE_SERVER to a healthy endpoint." | tee -a "$MASTER_LOG" >&2
+    echo "$listeners" | tee -a "$MASTER_LOG" >&2
+    exit 1
+  fi
+
   echo "[info] starting local release server on localhost:3231" | tee -a "$MASTER_LOG"
   (
     cd "$ROOT_DIR" || exit 1
-    python3 scripts/local-release-server.py --port 3231
+    python3 scripts/local-release-server.py --port 3231 --bin-dir "$ROOT_DIR/pkg"
   ) >"$LOG_DIR/local-release-server-${RUN_TS}.log" 2>&1 &
   server_pid=$!
 
   for _ in {1..20}; do
-    if curl -sS --max-time 3 "$sums_url" >/dev/null 2>&1; then
+    if curl -sS --max-time "$HEALTH_CHECK_TIMEOUT" "$health_url" >/dev/null 2>&1; then
       echo "[info] local release server ready (pid=$server_pid)" | tee -a "$MASTER_LOG"
       return
     fi
@@ -70,7 +95,12 @@ echo "RELEASE_SERVER=$RELEASE_SERVER" | tee -a "$MASTER_LOG"
 echo "SUMMARY_TSV=$SUMMARY_TSV" | tee -a "$MASTER_LOG"
 echo | tee -a "$MASTER_LOG"
 
-mapfile -t templates < <(find "$TEMPLATE_DIR" -maxdepth 1 -type f -name '*.pkr.hcl' | sort)
+# macOS default bash is 3.x and does not support mapfile.
+templates=()
+while IFS= read -r line; do
+  templates+=("$line")
+done < <(find "$TEMPLATE_DIR" -maxdepth 1 -type f -name '*.pkr.hcl' | sort)
+
 if [[ ${#templates[@]} -eq 0 ]]; then
   echo "error: no templates found in $TEMPLATE_DIR" | tee -a "$MASTER_LOG" >&2
   exit 1