wip: ci

Author: sdqede

.github/workflows/solana-unit-tests.yaml

@@ -52,18 +52,36 @@ jobs:
 
           # Start port-forward and keep this step alive while tests run
           if [ -n "${NS}" ]; then
-            NS="$NS" bash networks/solana/starship/port-forward.sh &
+            PORTS_ENV_FILE="networks/solana/starship/.pf-env" NS="$NS" bash networks/solana/starship/port-forward.sh &
             PF_SUPERVISOR_PID=$!
             # Clean up on exit
             trap 'echo "Stopping port-forward"; kill -9 ${PF_SUPERVISOR_PID} >/dev/null 2>&1 || true; pkill -f "kubectl -n ${NS} port-forward" || true' EXIT
           else
             echo "Could not determine namespace for port-forward" >&2
           fi
 
-          echo "Waiting for RPC health on 127.0.0.1:8899 ..."
+          # Load dynamic ports from port-forward script if provided
+          PF_ENV="networks/solana/starship/.pf-env"
+          for i in $(seq 1 50); do
+            if [ -f "$PF_ENV" ]; then
+              # shellcheck disable=SC1090
+              . "$PF_ENV" || true
+              break
+            fi
+            sleep 0.2
+          done
+
+          RPC_PORT="${SOLANA_RPC_PORT:-8899}"
+          WS_PORT="${SOLANA_WS_PORT:-8900}"
+          export SOLANA_RPC_PORT="$RPC_PORT"
+          export SOLANA_WS_PORT="$WS_PORT"
+          export SOLANA_RPC_ENDPOINT="http://127.0.0.1:${RPC_PORT}"
+          export SOLANA_WS_ENDPOINT="ws://127.0.0.1:${WS_PORT}"
+
+          echo "Waiting for RPC health on 127.0.0.1:${RPC_PORT} ..."
           ok=0
           for i in $(seq 1 60); do
-            if curl -fsS http://127.0.0.1:8899/health | grep -qi ok; then
+            if curl -fsS "http://127.0.0.1:${RPC_PORT}/health" | grep -qi ok; then
               ok=1; break
             fi
             sleep 5
@@ -76,18 +94,18 @@ jobs:
             exit 1
           fi
 
-          echo "Waiting for WS port on 127.0.0.1:8900 ..."
+          echo "Waiting for WS port on 127.0.0.1:${WS_PORT} ..."
           ws_ok=0
           for i in $(seq 1 60); do
             if command -v nc >/dev/null 2>&1; then
-              if nc -z 127.0.0.1 8900 >/dev/null 2>&1; then ws_ok=1; break; fi
+              if nc -z 127.0.0.1 "${WS_PORT}" >/dev/null 2>&1; then ws_ok=1; break; fi
             else
-              if (exec 3<>/dev/tcp/127.0.0.1/8900) 2>/dev/null; then exec 3>&- 3<&-; ws_ok=1; break; fi
+              if (exec 3<>/dev/tcp/127.0.0.1/"${WS_PORT}") 2>/dev/null; then exec 3>&- 3<&-; ws_ok=1; break; fi
             fi
             sleep 2
           done
           if [ "$ws_ok" -ne 1 ]; then
-            echo "WebSocket port 8900 not reachable; dumping diagnostics" >&2
+            echo "WebSocket port ${WS_PORT} not reachable; dumping diagnostics" >&2
             if command -v ss >/dev/null 2>&1; then ss -ltnp || true; fi
             if command -v lsof >/dev/null 2>&1; then lsof -iTCP -sTCP:LISTEN || true; fi
             kubectl get svc -A -o wide || true

networks/solana/starship/port-forward.sh

@@ -6,6 +6,7 @@ NS="${NS:-default}"   # Override with --ns
 POD_NAME=""           # Override with --pod
 SLEEP_BETWEEN=0.2
 CHECK_RETRIES=25      # 25 * 0.2s = 5s
+PORTS_ENV_FILE="${PORTS_ENV_FILE:-$(dirname "$0")/.pf-env}"
 
 usage() {
   echo "Usage: $0 [--ns <namespace>] [--pod <pod-name>]"
@@ -39,11 +40,15 @@ start_pf() {
   local target="$1"   # pods/<pod> or service/<svc>
   local mapping="$2"  # <local>:<remote>
   local local_port="${mapping%%:*}"
+  local remote_port="${mapping##*:}"
 
   free_port "$local_port"
 
   # Start in background
-  kubectl -n "$NS" port-forward "$target" "$mapping" >/dev/null 2>&1 &
+  # Capture logs for troubleshooting in CI
+  mkdir -p "$(dirname "$PORTS_ENV_FILE")"
+  local log_file="$(dirname "$PORTS_ENV_FILE")/pf_${local_port}.log"
+  kubectl -n "$NS" port-forward "$target" "$mapping" >"$log_file" 2>&1 &
   local pf_pid=$!
 
   # Health check: wait for local port to open
@@ -69,14 +74,45 @@ start_pf() {
 
   if [[ $ok -eq 1 ]]; then
     log "Forwarded $target  (local $mapping)"
+    # Record ports to env file for consumers (e.g., CI step/tests)
+    case "$remote_port" in
+      8899)
+        echo "export SOLANA_RPC_PORT=$local_port" >>"$PORTS_ENV_FILE" ;;
+      8900)
+        echo "export SOLANA_WS_PORT=$local_port" >>"$PORTS_ENV_FILE" ;;
+      8080)
+        echo "export REGISTRY_REST_PORT=$local_port" >>"$PORTS_ENV_FILE" ;;
+      9090)
+        echo "export REGISTRY_GRPC_PORT=$local_port" >>"$PORTS_ENV_FILE" ;;
+    esac
     return 0
   else
     err "Failed to forward $target  (local $mapping); killing pid $pf_pid"
     kill -9 "$pf_pid" >/dev/null 2>&1 || true
+    # Surface port-forward logs to help debugging
+    if [[ -f "$log_file" ]]; then
+      err "---- port-forward log ($log_file) ----"
+      tail -n +1 "$log_file" >&2 || true
+      err "---- end log ----"
+    fi
     return 1
   fi
 }
 
+# Try a list of local ports for a given remote port and record the first success
+start_pf_any() {
+  local target="$1"
+  local remote_port="$2"
+  shift 2
+  local candidate
+  for candidate in "$@"; do
+    if start_pf "$target" "${candidate}:${remote_port}"; then
+      return 0
+    fi
+  done
+  return 1
+}
+
 # Resolve POD_NAME if not provided
 resolve_pod() {
   if [[ -n "$POD_NAME" ]]; then
@@ -108,12 +144,26 @@ fi
 log "Using namespace: $NS"
 log "Using pod:       $POD_NAME"
 
+# Reset env file for fresh run
+mkdir -p "$(dirname "$PORTS_ENV_FILE")"
+: > "$PORTS_ENV_FILE"
+
 success=0
 
 # ---- Pod/Service Ports (with fallback) ----
 # Try pod first; if it fails, fall back to service/solana-genesis
 ( start_pf "pods/$POD_NAME" "8899:8899" || start_pf "service/solana-genesis" "8899:8899" ) && ((success++))  # Solana RPC
-( start_pf "pods/$POD_NAME" "8900:8900" || start_pf "service/solana-genesis" "8900:8900" ) && ((success++))  # Solana WS
+
+# WebSocket: try default 8900 locally; if bind fails, try alternates and record selected port
+if start_pf "pods/$POD_NAME" "8900:8900" || start_pf "service/solana-genesis" "8900:8900"; then
+  ((success++))
+else
+  # Try alternate local ports mapping to remote 8900
+  if start_pf_any "pods/$POD_NAME" 8900 8910 18900 19000 29000 || \
+     start_pf_any "service/solana-genesis" 8900 8910 18900 19000 29000; then
+    ((success++))
+  fi
+fi
 start_pf "pods/$POD_NAME" "8001:8001" && ((success++))  # Exposer
 start_pf "pods/$POD_NAME" "9900:9900" && ((success++))  # Faucet