From df4161d87895523150969a39a7ed5441d4b4f5f1 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 17 Jun 2021 19:45:23 +0200 Subject: [PATCH] Revert "ci: work around #19442 to make CI happy again" The fix/workaround from #18851 should, hopefully, make this redundant. This reverts commit 48a3cf58d5ad9cf2a4a4e6167171070b88c25369. --- .github/workflows/mkosi.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index d6b0566605..babdf7ae6e 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -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