Skip to content

Commit 6f40855

Browse files
derekhigginsclaude
authored andcommitted
fix(ci): prevent test fixtures from overwriting main server log (#5797)
## Summary - Rename main server log from `server.log` to `server-main.log` in `scripts/integration-tests.sh` - Prevents test fixtures (e.g. telemetry tests) that start their own server instances from deleting and overwriting the main server's log - Both files are still captured by the existing `*.log` artifact upload glob Fixes #5796 ## Test plan - [ ] CI integration tests still collect server logs correctly - [ ] Fixture server logs remain separate from main server log Signed-off-by: Derek Higgins <derekh@redhat.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> (cherry picked from commit e97035f)
1 parent 4d0c563 commit 6f40855

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

scripts/integration-tests.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ if [[ "$STACK_CONFIG" == *"server:"* && "$COLLECT_ONLY" == false ]]; then
373373

374374
# remove "server:" from STACK_CONFIG
375375
stack_config=$(echo "$STACK_CONFIG" | sed 's/^server://')
376-
nohup ogx stack run $stack_config >server.log 2>&1 &
376+
nohup ogx stack run $stack_config >server-main.log 2>&1 &
377377

378378
echo "Waiting for OGX Server to start on port $OGX_PORT..."
379379
for i in {1..60}; do
@@ -384,7 +384,7 @@ if [[ "$STACK_CONFIG" == *"server:"* && "$COLLECT_ONLY" == false ]]; then
384384
if [[ $i -eq 60 ]]; then
385385
echo "❌ OGX Server failed to start"
386386
echo "Server logs:"
387-
cat server.log
387+
cat server-main.log
388388
exit 1
389389
fi
390390
sleep 1
@@ -395,7 +395,7 @@ if [[ "$STACK_CONFIG" == *"server:"* && "$COLLECT_ONLY" == false ]]; then
395395
else
396396
echo "❌ OGX Server is not accessible on IPv6 loopback"
397397
echo "Server logs:"
398-
cat server.log
398+
cat server-main.log
399399
exit 1
400400
fi
401401
echo ""
@@ -649,8 +649,8 @@ else
649649
echo "❌ Tests failed"
650650
echo ""
651651
# Output server or container logs based on stack config
652-
if [[ "$STACK_CONFIG" == *"server:"* && -f "server.log" ]]; then
653-
echo "--- Server side failures can be located inside server.log (available from artifacts on CI) ---"
652+
if [[ "$STACK_CONFIG" == *"server:"* && -f "server-main.log" ]]; then
653+
echo "--- Server side failures can be located inside server-main.log (available from artifacts on CI) ---"
654654
elif [[ "$STACK_CONFIG" == *"docker:"* ]]; then
655655
docker_log_file="docker-${DISTRO}-${INFERENCE_MODE}.log"
656656
if [[ -f "$docker_log_file" ]]; then

0 commit comments

Comments
 (0)