1
0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00

Revert "ci: work around #19442 to make CI happy again"

The fix/workaround from #18851 should, hopefully, make this redundant.

This reverts commit 48a3cf58d5.
This commit is contained in:
Frantisek Sumsal 2021-06-17 19:45:23 +02:00 committed by Luca Boccassi
parent ff0771bfc8
commit df4161d878

View File

@ -51,14 +51,8 @@ jobs:
- name: Show ${{ matrix.distro }} image summary
run: sudo python3 -m mkosi --password= --qemu-headless summary
# Ugly workaround for systemd/systemd#19442 where systemd-nspawn
# occasionally fails with 'Failed to dissect image xxx: Connection timed out
- name: Retry the build if necessary
if: ${{ matrix.distro == 'arch' }}
run: echo "BUILD_RETRY_MAX=3" >> $GITHUB_ENV
- name: Boot ${{ matrix.distro }} systemd-nspawn
run: sudo -E bash +e -x -c 'for _ in $(seq 1 ${BUILD_RETRY_MAX:-1}); do ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless boot && break; done'
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless boot
- name: Boot ${{ matrix.distro }} QEMU
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless qemu