fix(tests): handle http URLs as aliases for server mode (#4306)

Small fix needed for llama-stack-ops which invokes integration-tests.sh
against docker by using a `http://` URL for stack-config
This commit is contained in:
Ashwin Bharambe 2025-12-03 21:21:18 -08:00 committed by GitHub
parent 1d9349c8d6
commit c6609a84f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -161,7 +161,7 @@ echo "Setting SQLITE_STORE_DIR: $SQLITE_STORE_DIR"
# Determine stack config type for api_recorder test isolation # Determine stack config type for api_recorder test isolation
if [[ "$COLLECT_ONLY" == false ]]; then if [[ "$COLLECT_ONLY" == false ]]; then
if [[ "$STACK_CONFIG" == server:* ]] || [[ "$STACK_CONFIG" == docker:* ]]; then if [[ "$STACK_CONFIG" == server:* ]] || [[ "$STACK_CONFIG" == docker:* ]] || [[ "$STACK_CONFIG" == http://* ]]; then
export LLAMA_STACK_TEST_STACK_CONFIG_TYPE="server" export LLAMA_STACK_TEST_STACK_CONFIG_TYPE="server"
echo "Setting stack config type: server" echo "Setting stack config type: server"
else else
@ -219,7 +219,7 @@ fi
find_available_port() { find_available_port() {
local start_port=$1 local start_port=$1
local port=$start_port local port=$start_port
for ((i=0; i<100; i++)); do for ((i = 0; i < 100; i++)); do
if ! lsof -Pi :$port -sTCP:LISTEN -t >/dev/null 2>&1; then if ! lsof -Pi :$port -sTCP:LISTEN -t >/dev/null 2>&1; then
echo $port echo $port
return 0 return 0
@ -322,16 +322,16 @@ if [[ "$STACK_CONFIG" == *"server:"* && "$COLLECT_ONLY" == false ]]; then
echo "=== Starting Llama Stack Server ===" echo "=== Starting Llama Stack Server ==="
export LLAMA_STACK_LOG_WIDTH=120 export LLAMA_STACK_LOG_WIDTH=120
# Configure telemetry collector for server mode # Configure telemetry collector for server mode
# Use a fixed port for the OTEL collector so the server can connect to it # Use a fixed port for the OTEL collector so the server can connect to it
COLLECTOR_PORT=4317 COLLECTOR_PORT=4317
export LLAMA_STACK_TEST_COLLECTOR_PORT="${COLLECTOR_PORT}" export LLAMA_STACK_TEST_COLLECTOR_PORT="${COLLECTOR_PORT}"
# Disabled: https://github.com/llamastack/llama-stack/issues/4089 # Disabled: https://github.com/llamastack/llama-stack/issues/4089
#export OTEL_EXPORTER_OTLP_ENDPOINT="http://127.0.0.1:${COLLECTOR_PORT}" #export OTEL_EXPORTER_OTLP_ENDPOINT="http://127.0.0.1:${COLLECTOR_PORT}"
export OTEL_EXPORTER_OTLP_PROTOCOL="http/protobuf" export OTEL_EXPORTER_OTLP_PROTOCOL="http/protobuf"
export OTEL_BSP_SCHEDULE_DELAY="200" export OTEL_BSP_SCHEDULE_DELAY="200"
export OTEL_BSP_EXPORT_TIMEOUT="2000" export OTEL_BSP_EXPORT_TIMEOUT="2000"
export OTEL_METRIC_EXPORT_INTERVAL="200" export OTEL_METRIC_EXPORT_INTERVAL="200"
# remove "server:" from STACK_CONFIG # remove "server:" from STACK_CONFIG
stack_config=$(echo "$STACK_CONFIG" | sed 's/^server://') stack_config=$(echo "$STACK_CONFIG" | sed 's/^server://')