Only add WarningAction when propagate: true

Update test
jenkinsci · Apr 5, 2023 · 1ca3981 · 1ca3981
1 parent 6c912a4
commit 1ca3981
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/WaitForBuildListener.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/WaitForBuildListener.java
@@ -28,7 +28,7 @@ public void onCompleted(Run<?,?> run, @NonNull TaskListener listener) {
             Result result = run.getResult();
             try {
                 context.get(TaskListener.class).getLogger().println("Build " + ModelHyperlinkNote.encodeTo("/" + run.getUrl(), run.getFullDisplayName()) + " completed: " + result.toString());
-                if (result.isWorseThan(Result.SUCCESS)) {
+                if (action.propagate && result.isWorseThan(Result.SUCCESS)) {
                     context.get(FlowNode.class).addOrReplaceAction(new WarningAction(result));
                 }
             } catch (Exception e) {

diff --git a/src/test/java/org/jenkinsci/plugins/workflow/support/steps/build/WaitForBuildStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/support/steps/build/WaitForBuildStepTest.java
@@ -83,7 +83,7 @@ public class WaitForBuildStepTest {
         us.setDefinition(new CpsFlowDefinition(
             "def ds = build job: 'ds', waitForStart: true\n" +
             "def dsRunId = \"${ds.getFullProjectName()}#${ds.getNumber()}\"\n" +
-            "def completeDs = waitForBuild runId: dsRunId\n" +
+            "def completeDs = waitForBuild runId: dsRunId, propagate: true\n" +
             "echo \"'ds' completed with status ${completeDs.getResult()}\"", true));
         j.assertLogContains("'ds' completed with status UNSTABLE", j.buildAndAssertSuccess(us));
         WorkflowRun lastUpstreamRun = us.getLastBuild();