From 85524b2d0ff29cf1d61b6bee321fb723c223bb9d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 13 Mar 2018 14:01:49 +0100 Subject: [PATCH] Disable jobset deletion This is a good way to make Hydra hang. (E.g. we had a deletion of nixos:gcc-7 running for > 12 hours and blocking UPDATE statements from hydra-queue-runner.) Generally it's better to just disable/hide an old jobset anyway. --- src/lib/Hydra/Controller/Jobset.pm | 4 +++- src/root/jobset.tt | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm index 42accac0..75284c10 100644 --- a/src/lib/Hydra/Controller/Jobset.pm +++ b/src/lib/Hydra/Controller/Jobset.pm @@ -92,7 +92,9 @@ sub jobset_PUT { sub jobset_DELETE { my ($self, $c) = @_; - requireProjectOwner($c, $c->stash->{project}); + #requireProjectOwner($c, $c->stash->{project}); + + requireAdmin($c); if (length($c->stash->{project}->declfile)) { error($c, "can't modify jobset of declarative project", 403); diff --git a/src/root/jobset.tt b/src/root/jobset.tt index 33139c74..9cf1202a 100644 --- a/src/root/jobset.tt +++ b/src/root/jobset.tt @@ -51,7 +51,9 @@