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

Open
wants to merge 2 commits into
base: rhcos-4.16
Choose a base branch
from
+2 −2
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e1ddd5
devshell: fix journal monitoring
jlebon May 10, 2024
1d29d29
Revert "ci: Use scos (at least for now)"
jlebon May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/prow-rhcos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion mantle/cmd/kola/devshell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Loading