aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2018-10-14 22:48:02 +0000
committerPascal Terjan <pterjan@mageia.org>2018-10-14 22:51:53 +0000
commitea9871879d0900d84b8c1a1a4b93db9fac754aed (patch)
tree7666e5e7194c0e186c163bed163dd0f79281297f
parent33e3b1947012309582892b54d4404f4f37745142 (diff)
downloadiurt-ea9871879d0900d84b8c1a1a4b93db9fac754aed.tar
iurt-ea9871879d0900d84b8c1a1a4b93db9fac754aed.tar.gz
iurt-ea9871879d0900d84b8c1a1a4b93db9fac754aed.tar.bz2
iurt-ea9871879d0900d84b8c1a1a4b93db9fac754aed.tar.xz
iurt-ea9871879d0900d84b8c1a1a4b93db9fac754aed.zip
Kill other architectures in case of failure
-rw-r--r--NEWS1
-rw-r--r--lib/Iurt/Queue.pm2
-rwxr-xr-xulri4
3 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 7caf616..5942425 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- ulri: only use mandatory archs for noarch builds
+- ulri: kill builds for other architectures in case of failure
0.7.6
- iurt: increase default timeout for commands to 10 minutes
diff --git a/lib/Iurt/Queue.pm b/lib/Iurt/Queue.pm
index 5d4dbc5..449ec36 100644
--- a/lib/Iurt/Queue.pm
+++ b/lib/Iurt/Queue.pm
@@ -143,8 +143,6 @@ sub cleanup_failed_build {
move($file, "$fail_dir/$prefix/");
}
}
-
- # TODO: abort all builds in progress
}
sub get_upload_tree_state {
diff --git a/ulri b/ulri
index 5398a9b..ad1fef8 100755
--- a/ulri
+++ b/ulri
@@ -297,6 +297,10 @@ foreach my $prefix (keys %pkg_tree) {
unless ($timeout || $zombie || $ended) {
# Everything is fine, build is continuing!
+ # Kill it if that package had failed on a mandatory arch
+ if (check_if_mandatory_arch_failed($media, $prefix, $ent, $config)) {
+ ssh($remote, "kill -14 $pid");
+ }
next bot;
}
if ($timeout) {