Merge branch 'main' into postgres-ssl

scripts/integration-tests.sh

@@ -133,6 +133,10 @@ else
     EXTRA_PARAMS=""
 fi
 
+THIS_DIR=$(dirname "$0")
+ROOT_DIR="$THIS_DIR/.."
+cd $ROOT_DIR
+
 # Set recording directory
 if [[ "$RUN_VISION_TESTS" == "true" ]]; then
     export LLAMA_STACK_TEST_RECORDING_DIR="tests/integration/recordings/vision"
@@ -142,24 +146,29 @@ fi
 
 # Start Llama Stack Server if needed
 if [[ "$STACK_CONFIG" == *"server:"* ]]; then
-    echo "=== Starting Llama Stack Server ==="
-    nohup uv run llama stack run ci-tests --image-type venv > server.log 2>&1 &
+    # check if server is already running
+    if curl -s http://localhost:8321/v1/health 2>/dev/null | grep -q "OK"; then
+        echo "Llama Stack Server is already running, skipping start"
+    else
+        echo "=== Starting Llama Stack Server ==="
+        nohup uv run llama stack run ci-tests --image-type venv > server.log 2>&1 &
 
-    echo "Waiting for Llama Stack Server to start..."
-    for i in {1..30}; do
-        if curl -s http://localhost:8321/v1/health 2>/dev/null | grep -q "OK"; then
-            echo "✅ Llama Stack Server started successfully"
-            break
-        fi
-        if [[ $i -eq 30 ]]; then
-            echo "❌ Llama Stack Server failed to start"
-            echo "Server logs:"
-            cat server.log
-            exit 1
-        fi
-        sleep 1
-    done
-    echo ""
+        echo "Waiting for Llama Stack Server to start..."
+        for i in {1..30}; do
+            if curl -s http://localhost:8321/v1/health 2>/dev/null | grep -q "OK"; then
+                echo "✅ Llama Stack Server started successfully"
+                break
+            fi
+            if [[ $i -eq 30 ]]; then
+                echo "❌ Llama Stack Server failed to start"
+                echo "Server logs:"
+                cat server.log
+                exit 1
+            fi
+            sleep 1
+        done
+        echo ""
+    fi
 fi
 
 # Run tests