From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 17 Jun 2021 17:45:23 +0000 (+0200)
Subject: Revert "ci: work around #19442 to make CI happy again"
X-Git-Tag: v249-rc2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df4161d87895523150969a39a7ed5441d4b4f5f1;p=thirdparty%2Fsystemd.git

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

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

This reverts commit 48a3cf58d5ad9cf2a4a4e6167171070b88c25369.
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index d6b05666056..babdf7ae6ea 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