Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test-journal-flush: use archived journal if possible #32571

Merged
merged 1 commit into from
Apr 30, 2024

Conversation

yuwata
Copy link
Member

@yuwata yuwata commented Apr 30, 2024

Workaround for #32436.

The test may fail if the journal is vacuumed or rotated during the test is running. Let's use the newest archive file for safety.

Workaround for systemd#32436.

The test may fail if the journal is vacuumed or rotated during the test is running.
Let's use the newest archive file for safety.
@yuwata yuwata added the tests label Apr 30, 2024
@github-actions github-actions bot added journal please-review PR is ready for (re-)review by a maintainer labels Apr 30, 2024
Copy link

Important

An -rc1 tag has been created and a release is being prepared, so please note that PRs introducing new features and APIs will be held back until the new version has been released.

if (r < 0)
return r;

p = strjoina("/var/log/journal/", SD_ID128_TO_STRING(machine_id), "/");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm this assumes we have a persistent journal. I'm considering making mkosi CI tests use only a runtime journal and not a persistent one, but this test would break then.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is no persistent journal, the test falls back to use runtime journal.

@DaanDeMeyer DaanDeMeyer merged commit 8719a65 into systemd:main Apr 30, 2024
43 of 48 checks passed
@github-actions github-actions bot removed the please-review PR is ready for (re-)review by a maintainer label Apr 30, 2024
@yuwata yuwata deleted the test-journal-flush branch April 30, 2024 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

2 participants