From aa9cbb6caa0e2cfb8f5709ee69656e96243fb87e Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 10 May 2024 09:22:25 -0400 Subject: [PATCH 1/2] devshell: fix journal monitoring Commit 7b07ffe8a 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 7b07ffe8a ("mantle/platform/qemu: drop json formatting from journal output"). --- mantle/cmd/kola/devshell.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mantle/cmd/kola/devshell.go b/mantle/cmd/kola/devshell.go index b81b249b17..bc572a5e35 100644 --- a/mantle/cmd/kola/devshell.go +++ b/mantle/cmd/kola/devshell.go @@ -430,7 +430,7 @@ func watchJournal(builder *platform.QemuBuilder, conf *conf.Conf, stateChan chan }, } - r, err := builder.VirtioJournal(conf, "--system") + r, err := builder.VirtioJournal(conf, "-o json --system") if err != nil { return err } From 7390bbb79196ab1ad406bdc9cbd090be8f85fdeb Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 10 May 2024 09:45:26 -0400 Subject: [PATCH 2/2] Revert "ci: Use scos (at least for now)" This reverts commit 0b659afbc0d85a010817863bfcaa53870c74d289. 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. --- ci/prow-rhcos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/prow-rhcos.sh b/ci/prow-rhcos.sh index 09bb0f835a..a19a3994e7 100755 --- a/ci/prow-rhcos.sh +++ b/ci/prow-rhcos.sh @@ -17,6 +17,6 @@ esac export COSA_SKIP_OVERLAY=1 # Create a temporary cosa workdir cd "$(mktemp -d)" -cosa init --variant scos --transient -b "${RHCOS_BRANCH}" https://github.com/openshift/os +cosa init --transient -b "${RHCOS_BRANCH}" https://github.com/openshift/os # Use a COSA specifc test entry point to focus on tests relevant for COSA exec src/config/ci/prow-entrypoint.sh rhcos-cosa-prow-pr-ci