From e7ed365e1ad9d7af242c8879ba3fc902cf8ae48e Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Mon, 30 Apr 2018 11:58:35 +0000 Subject: Fail build which timeout even is machine is unreachable --- NEWS | 1 + ulri | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index ee97552..44697f7 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ - increase default timeout for commands to 10 minutes +- consider build fail after faildelay even if machine is unreachable 0.7.5 - iurt: fix checking if chroot needs updating diff --git a/ulri b/ulri index 532cb36..ee08226 100755 --- a/ulri +++ b/ulri @@ -276,12 +276,12 @@ foreach my $prefix (keys %pkg_tree) { my $status_file = "$prefix_dir/log/status.log"; plog('INFO', "check status: $host/$arch ($bot [$pid])"); + my $timeout = (time()-$time) > $config->{faildelay}; my $status = sout($remote, "cat $status_file"); if ($? == 255) { plog('WARN', "failed to get status for $host/$arch"); - # TODO Check for timeout, else we may have packages stuck forever - # when losing a machine. - next bot; + # If we are already out of time, we should fail anyway + next bot unless $timeout; } my $proc_state; -- cgit v1.2.1