[JENKINS-49073] Propagate the downstream result, not just FAILURE

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.33</version>
+        <version>3.43</version>
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins</groupId>

src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerListener.java

@@ -11,6 +11,7 @@
 import java.util.logging.Logger;
 import javax.annotation.Nonnull;
 import jenkins.util.Timer;
+import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 
 @Extension
@@ -49,7 +50,8 @@ public void onCompleted(Run<?,?> run, @Nonnull TaskListener listener) {
                     trigger.context.onFailure(trigger.interruption);
                 }
             } else {
-                trigger.context.onFailure(new AbortException(run.getFullDisplayName() + " completed with status " + run.getResult() + " (propagate: false to ignore)"));
+                Result result = run.getResult();
+                trigger.context.onFailure(new FlowInterruptedException(result != null ? result : /* probably impossible */ Result.FAILURE, new DownstreamFailureCause(run)));
             }
         }
         run.getActions().removeAll(run.getActions(BuildTriggerAction.class));

src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/DownstreamFailureCause.java

@@ -0,0 +1,57 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2019 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.jenkinsci.plugins.workflow.support.steps.build;
+
+import hudson.model.Run;
+import javax.annotation.CheckForNull;
+import jenkins.model.CauseOfInterruption;
+
+/**
+ * Indicates that an upstream build failed because of a downstream build’s status.
+ */
+public final class DownstreamFailureCause extends CauseOfInterruption {
+
+    private static final long serialVersionUID = 1;
+
+    private final String id;
+
+    DownstreamFailureCause(Run<?, ?> downstream) {
+        id = downstream.getExternalizableId();
+    }
+
+    public @CheckForNull Run<?, ?> getDownstreamBuild() {
+        return Run.fromExternalizableId(id);
+    }
+
+    @Override public String getShortDescription() {
+        Run<?, ?> downstream = getDownstreamBuild();
+        if (downstream != null) {
+            return downstream.getFullDisplayName() + " completed with status " + downstream.getResult() + " (propagate: false to ignore)";
+        } else {
+            return "Downstream build was not stable (propagate: false to ignore)";
+        }
+    }
+
+}

src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/DownstreamFailureCause/summary.jelly

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The MIT License
+
+Copyright 2019 CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core">
+    <j:set var="ds" value="${it.downstreamBuild}"/>
+    <j:choose>
+        <j:when test="${ds != null}">
+            <a class="model-link inside" href="${rootURL}/${ds.url}">${ds.fullDisplayName}</a> was not stable
+        </j:when>
+        <j:otherwise>
+            <j:out value="${it.shortDescription}"/>
+        </j:otherwise>
+    </j:choose>
+</j:jelly>

src/test/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStepTest.java

@@ -2,8 +2,11 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Launcher;
+import hudson.model.AbstractBuild;
 import hudson.model.Action;
 import hudson.model.BooleanParameterDefinition;
+import hudson.model.BuildListener;
 import hudson.model.Cause;
 import hudson.model.Computer;
 import hudson.model.Executor;
@@ -62,6 +65,7 @@
 import org.jvnet.hudson.test.MockFolder;
 import org.jvnet.hudson.test.MockQueueItemAuthenticator;
 import org.jvnet.hudson.test.SleepBuilder;
+import org.jvnet.hudson.test.TestBuilder;
 import org.jvnet.hudson.test.TestExtension;
 import org.jvnet.hudson.test.recipes.LocalData;
 
@@ -178,7 +182,21 @@ public void abortBuild() throws Exception {
         fb.getExecutor().interrupt();
 
         j.assertBuildStatus(Result.ABORTED, j.waitForCompletion(fb));
-        j.assertBuildStatus(Result.FAILURE,q.get());
+        j.assertBuildStatus(Result.ABORTED, q.get());
+    }
+
+    @Issue("JENKINS-49073")
+    @Test public void downstreamUnstable() throws Exception {
+        FreeStyleProject ds = j.createFreeStyleProject("ds");
+        ds.getBuildersList().add(new TestBuilder() {
+            @Override public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
+                build.setResult(Result.UNSTABLE);
+                return true;
+            }
+        });
+        WorkflowJob us = j.createProject(WorkflowJob.class, "us");
+        us.setDefinition(new CpsFlowDefinition("build 'ds'", true));
+        j.assertBuildStatus(Result.UNSTABLE, us.scheduleBuild2(0));
     }
 
     @Test