diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-28 16:21:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 16:21:15 +0100 |
| commit | c97aafcda37975fe04b3eac8c675515586da4a88 (patch) | |
| tree | e51d9ad3119359472dcd6fc77f384c4dd890bca4 /tests | |
| parent | ee490bf9babb7db363c33ebfb03186bd8452472e (diff) | |
| parent | 975496d241d101ed19826bd6bb732dbea9e85813 (diff) | |
| download | ostree-c97aafcda37975fe04b3eac8c675515586da4a88.tar.gz | |
Merge pull request #2285 from cgwalters/log-bootloader-stuff
deploy: Add subbootversion to journal
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/kolainst/destructive/staged-deploy.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/kolainst/destructive/staged-deploy.sh b/tests/kolainst/destructive/staged-deploy.sh index a5da0119..0068ed56 100755 --- a/tests/kolainst/destructive/staged-deploy.sh +++ b/tests/kolainst/destructive/staged-deploy.sh @@ -54,7 +54,7 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in rpm-ostree status # Assert that the previous boot had a journal entry for it journalctl -b "-1" -u ostree-finalize-staged.service > svc.txt - assert_file_has_content svc.txt 'Bootloader updated; bootconfig swap: yes; deployment count change: 1' + assert_file_has_content svc.txt 'Bootloader updated; bootconfig swap: yes;.*deployment count change: 1' rm -f svc.txt # And there should not be a staged deployment test '!' -f /run/ostree/staged-deployment |