Avoid logging when setResult is predicted to do nothing #308 (comment)

jenkinsci · Apr 26, 2024 · 6a6e341 · 6a6e341
1 parent cfa55a8
commit 6a6e341
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/steps/CatchErrorStep.java b/src/main/java/org/jenkinsci/plugins/workflow/steps/CatchErrorStep.java
@@ -248,8 +248,12 @@ public Object readResolve() {
                         Functions.printStackTrace(t, listener.getLogger());
                     }
                     if (buildResult.isWorseThan(Result.SUCCESS)) {
-                        listener.getLogger().println("Setting overall build result to " + buildResult);
-                        context.get(Run.class).setResult(buildResult);
+                        Run<?, ?> build = context.get(Run.class);
+                        Result currentResult = build.getResult();
+                        if (currentResult == null || buildResult.isWorseThan(currentResult)) {
+                            listener.getLogger().println("Setting overall build result to " + buildResult);
+                        } // otherwise WorkflowRun.setResult should be a no-op, so do not log anything
+                        build.setResult(buildResult);
                     }
                     if (stepResult.isWorseThan(Result.SUCCESS)) {
                         context.get(FlowNode.class).addOrReplaceAction(new WarningAction(stepResult).withMessage(message));