almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Retry ostree installer task on losetup error

Browse Source 
This uses a previous change that added ability to retry and simply
extends the conditions when it fires.

JIRA: RHELCMP-1863
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2020-08-04 15:55:12 +02:00
parent 3c72755814
commit a294a05726
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pungi/phases/ostree_installer.py
View File

@ -286,4 +286,5 @@ class OstreeInstallerThread(WorkerThread):
mounts=[compose.topdir], mounts=[compose.topdir],
chown_paths=[output_dir], chown_paths=[output_dir],
weight=compose.conf["runroot_weights"].get("ostree_installer"), weight=compose.conf["runroot_weights"].get("ostree_installer"),
log_dir=self.logdir,
) )

3
pungi/runroot.py
View File

@ -14,6 +14,7 @@
# along with this program; if not, see <https://gnu.org/licenses/>. # along with this program; if not, see <https://gnu.org/licenses/>.
import os import os
import re
from six.moves import shlex_quote from six.moves import shlex_quote
import kobo.log import kobo.log
from kobo.shortcuts import run from kobo.shortcuts import run
@ -95,6 +96,8 @@ class Runroot(kobo.log.LoggingBase):
for line in f: for line in f:
if "losetup: cannot find an unused loop device" in line: if "losetup: cannot find an unused loop device" in line:
return True return True
if re.match("losetup: .* failed to set up loop device", line):
return True
except Exception: except Exception:
pass pass
return False return False