system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-22 02:34:54 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

mkosi: Remove explicit /testok check

Browse source 
vsock should work properly after the latest release of mkosi. But
to make sure it works, let's exit with 123 in case of success and
check for that in Github Actions.
This commit is contained in:
Daan De Meyer 2023-06-08 17:50:05 +02:00
parent abeecde242
commit 6aca147f82
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/mkosi.yml vendored
View file

@ -121,11 +121,7 @@ jobs:
run: mkosi --debug run: mkosi --debug
- name: Boot ${{ matrix.distro }} systemd-nspawn - name: Boot ${{ matrix.distro }} systemd-nspawn
run: sudo mkosi --debug boot run: test "$(sudo mkosi --debug boot 1>&2; echo $?)" -eq 123
- name: Boot ${{ matrix.distro }} QEMU - name: Boot ${{ matrix.distro }} QEMU
run: timeout -k 30 10m mkosi --debug qemu run: timeout -k 30 10m test "$(mkosi --debug qemu 1>&2; echo $?)" -eq 123
# vsock in Github Actions with qemu is broken so for now we check for failures manually.
- name: Check ${{ matrix.distro }} QEMU
run: sudo mkosi shell bash -c "[[ -e /testok ]] || { cat /failed-services; exit 1; }"

6
mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
View file

@ -1,8 +1,6 @@
#!/bin/bash -eux #!/bin/bash -eux
# SPDX-License-Identifier: LGPL-2.1-or-later # SPDX-License-Identifier: LGPL-2.1-or-later
rm -f /testok
# TODO: Figure out why this is failing # TODO: Figure out why this is failing
systemctl reset-failed systemd-vconsole-setup.service systemctl reset-failed systemd-vconsole-setup.service
@ -20,4 +18,6 @@ fi
# Exit with non-zero EC if the /failed-services file is not empty (we have -e set) # Exit with non-zero EC if the /failed-services file is not empty (we have -e set)
[[ ! -s /failed-services ]] [[ ! -s /failed-services ]]
touch /testok # On success, exit with 123 so that we can check that we receive the actual exit code from the script on the
# host.
exit 123