From 216d8bee3532d3d5a2326aff3f7c8bd8cff6c007 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 14 Dec 2021 22:10:02 -0500
Subject: [PATCH] DynamicRunCommand: don't run if the build failed

---
 src/lib/Hydra/Plugin/RunCommand.pm |  5 ++++-
 t/Hydra/Plugin/RunCommand/fanout.t |  8 ++++++++
 t/jobs/runcommand-dynamic.nix      | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/lib/Hydra/Plugin/RunCommand.pm b/src/lib/Hydra/Plugin/RunCommand.pm
index 8998fc39..2ab20274 100644
--- a/src/lib/Hydra/Plugin/RunCommand.pm
+++ b/src/lib/Hydra/Plugin/RunCommand.pm
@@ -40,6 +40,10 @@ sub areDynamicCommandsEnabled {
 sub isBuildEligibleForDynamicRunCommand {
     my ($build) = @_;
 
+    if ($build->get_column("buildstatus") != 0) {
+        return 0;
+    }
+
     if ($build->get_column("job") =~ "^runCommandHook\..+") {
         my $out = $build->buildoutputs->find({name => "out"});
         if (!defined $out) {
@@ -135,7 +139,6 @@ sub fanoutToCommands {
         # missing test cases:
         #
         # 1. is it enabled on the jobset?
-        # 2. what if the build failed?
         if (isBuildEligibleForDynamicRunCommand($build)) {
             my $job = $build->get_column('job');
             my $out = $build->buildoutputs->find({name => "out"});
diff --git a/t/Hydra/Plugin/RunCommand/fanout.t b/t/Hydra/Plugin/RunCommand/fanout.t
index 41236456..8d34e582 100644
--- a/t/Hydra/Plugin/RunCommand/fanout.t
+++ b/t/Hydra/Plugin/RunCommand/fanout.t
@@ -159,6 +159,14 @@ subtest "isBuildEligibleForDynamicRunCommand" => sub {
             "out is a symlink to a directory"
         );
     };
+
+    subtest "On build status ..." => sub {
+        is(
+            Hydra::Plugin::RunCommand::isBuildEligibleForDynamicRunCommand($builds->{"runCommandHook.failed"}),
+            0,
+            "Failed builds don't get run"
+        );
+    };
 };
 
 
diff --git a/t/jobs/runcommand-dynamic.nix b/t/jobs/runcommand-dynamic.nix
index c0b005b7..1971bb82 100644
--- a/t/jobs/runcommand-dynamic.nix
+++ b/t/jobs/runcommand-dynamic.nix
@@ -127,4 +127,22 @@ rec {
     ];
   };
 
+  runCommandHook.failed = mkDerivation {
+    name = "failed";
+    builder = "/bin/sh";
+    outputs = [ "out" ];
+    args = [
+      (
+        builtins.toFile "builder.sh" ''
+          #! /bin/sh
+
+          touch $out
+          chmod +x $out
+
+          exit 1
+        ''
+      )
+    ];
+  };
+
 }