devshell: fix journal monitoring #3799
Conversation
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").
|
If this gets merged, we should probably backport it to 4.16 too. /cherrypick rhcos-4.16 |
|
@jlebon: once the present PR merges, I will cherry-pick it on top of rhcos-4.16 in a new PR and assign it to you. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
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.
|
OK, added a commit to fix Prow CI here as well. |
|
Prow failed on |
|
@jlebon: Overrode contexts on behalf of jlebon: ci/prow/rhcos In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
@jlebon: new pull request created: #3802 In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
Commit 7b07ffe dropped the
-o jsonargument 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").