shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-26 14:04:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2659 from cgwalters/hackaround-cosa-systemd-unit-check

Browse Source
This commit is contained in:
Jonathan Lebon 2022-06-24 10:49:19 -04:00 committed by GitHub
commit 502ad96af2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/kolainst/destructive/staged-deploy.sh
View File

@ -150,13 +150,27 @@ EOF
# Now finally, try breaking staged updates and verify that ostree-boot-complete fails on the next boot
unshare -m /bin/sh -c 'mount -o remount,rw /boot; chattr +i /boot'
rpm-ostree kargs --append=foo=bar
# Hack around https://github.com/coreos/coreos-assembler/pull/2921#issuecomment-1156592723
# where coreos-assembler/kola check systemd unit status right after ssh.
cat >/etc/systemd/system/hackaround-cosa-systemd-unit-checks.service << 'EOF'
[Unit]
Before=systemd-user-sessions.service
[Service]
Type=oneshot
ExecStart=/bin/sh -c '(systemctl status ostree-boot-complete.service || true) | tee /run/ostree-boot-complete-status.txt'
ExecStart=/bin/systemctl reset-failed ostree-boot-complete.service
[Install]
WantedBy=multi-user.target
EOF
systemctl enable hackaround-cosa-systemd-unit-checks.service
/tmp/autopkgtest-reboot "3"
;;
"3")
(systemctl status ostree-boot-complete.service || true) | tee out.txt
assert_file_has_content out.txt 'error: ostree-finalize-staged.service failed on previous boot.*Operation not permitted'
systemctl show -p Result ostree-boot-complete.service > out.txt
assert_file_has_content out.txt='Result=exit-code'
assert_file_has_content /run/ostree-boot-complete-status.txt 'error: ostree-finalize-staged.service failed on previous boot.*Operation not permitted'
echo "ok boot-complete.service"
;;
*) fatal "Unexpected AUTOPKGTEST_REBOOT_MARK=${AUTOPKGTEST_REBOOT_MARK}" ;;