Skip to content

fix(ci): prevent test fixtures from overwriting main server log (backport #5797) - #5814

Closed
mergify[bot] wants to merge 1 commit into
release-1.0.xfrom
mergify/bp/release-1.0.x/pr-5797
Closed

fix(ci): prevent test fixtures from overwriting main server log (backport #5797)#5814
mergify[bot] wants to merge 1 commit into
release-1.0.xfrom
mergify/bp/release-1.0.x/pr-5797

Conversation

@mergify

@mergify mergify Bot commented May 12, 2026

Copy link
Copy Markdown
Contributor

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

@leseb

leseb commented May 12, 2026

Copy link
Copy Markdown
Member

needs #5812

@leseb
leseb enabled auto-merge May 12, 2026 15:30
@leseb

leseb commented May 12, 2026

Copy link
Copy Markdown
Member

@Mergifyio rebase

## 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)
@mergify

mergify Bot commented May 12, 2026

Copy link
Copy Markdown
Contributor Author

rebase

✅ Branch has been successfully rebased

@leseb
leseb force-pushed the mergify/bp/release-1.0.x/pr-5797 branch from 2780a7e to 6f40855 Compare May 12, 2026 15:32
@github-actions

Copy link
Copy Markdown
Contributor

This pull request has been automatically marked as stale because it has not had activity within 60 days. It will be automatically closed if no further activity occurs within 30 days.

@github-actions github-actions Bot added the stale label Jul 12, 2026
auto-merge was automatically disabled July 12, 2026 00:29

Merge commits are not allowed on this repository

@github-actions

Copy link
Copy Markdown
Contributor

This pull request has been automatically closed due to inactivity. Please feel free to reopen if you intend to continue working on it!

@github-actions github-actions Bot closed this Aug 12, 2026
@mergify

mergify Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor Author

rebase

☑️ Nothing to do, the required conditions are not met

Details
  • -closed [📌 rebase requirement]
  • -conflict [📌 rebase requirement]
  • queue-position = -1 [📌 rebase requirement]
  • any of:
    • #commits-behind > 0 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants