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.

Sign up for GitHub

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

Jump to bottom

[rhcos-4.16] devshell: fix journal monitoring #3802

Merged
merged 2 commits into from
Jul 29, 2024
Merged

[rhcos-4.16] devshell: fix journal monitoring #3802

merged 2 commits into from
Jul 29, 2024

Commits on May 10, 2024

  1. devshell: fix journal monitoring 

    Commit 7b07ffe dropped the `-o json` argument to the journalctl query
that the devshell code uses to monitor system boot and know when to SSH.
Fix this by re-adding the argument but only for devshell so that the
default is still to output traditional logs (as in the testiso case).

Fixes 7b07ffe ("mantle/platform/qemu: drop json formatting from
journal output").
    @jlebon
    jlebon authored and openshift-cherrypick-robot committed May 10, 2024
    Configuration menu
    Copy the full SHA
    4e1ddd5 View commit details
    Browse the repository at this point in the history

  2. Revert "ci: Use scos (at least for now)" 

    This reverts commit 0b659af.

That was meant to be a temporary measure but lingered for a while. As
mentioned there, ideally, we'd build both, but if we only build one, let
it be RHCOS.
    @jlebon
    jlebon authored and openshift-cherrypick-robot committed May 10, 2024
    Configuration menu
    Copy the full SHA
    1d29d29 View commit details
    Browse the repository at this point in the history