Merge branch 'dcoraboeuf-master'

see pull request #56.
Displays the tree of upstream causes

Author: dnozay

README.md

@@ -66,8 +66,10 @@ For example:
     out.println params
     out.println 'Build Object Properties:'
     build.properties.each { out.println "$it.key -> $it.value" }
-
-
+    
+    // output git commit info (git plugin)
+    out.println build.environment.get('GIT_COMMIT')
+    
     // use it in the flow
     build("job1", parent_param1: params["param1"])
     build("job2", parent_workspace:build.workspace)

pom.xml

@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.480</version>
+    <version>1.509.1</version>
   </parent>
 
   <groupId>com.cloudbees.plugins</groupId>

src/main/resources/com/cloudbees/plugins/flow/FlowCause/description.groovy

@@ -0,0 +1,31 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
+    <j:set var="proj" value="${app.getItemByFullName(it.buildFlow)}"/>
+    <j:choose>
+        <j:when test="${proj != null}">
+            <j:set var="build" value="${proj.getBuildByNumber(it.buildNumber)}"/>
+            <j:choose>
+                <j:when test="${build != null}">
+                    ${%message(rootURL, proj.url, it.buildFlow, it.buildNumber)}
+                </j:when>
+                <j:otherwise>
+                    ${%message_no_build(rootURL, proj.url, it.buildFlow, it.buildNumber)}
+                </j:otherwise>
+            </j:choose>
+        </j:when>
+        <j:otherwise>
+            ${%message_no_job(rootURL, null, it.buildFlow, it.buildNumber)}
+        </j:otherwise>
+    </j:choose>
+    <j:if test="${!it.upstreamCauses.isEmpty()}">
+        <br/>
+        <j:out value="${%caused_by}"/>
+        <ul>
+            <j:forEach var="c" items="${it.upstreamCauses}">
+                <li>
+                    <st:include page="description.jelly" it="${c}"/>
+                </li>
+            </j:forEach>
+        </ul>
+    </j:if>
+</j:jelly>

src/main/resources/com/cloudbees/plugins/flow/FlowCause/description.jelly

@@ -23,4 +23,5 @@
 #
 message=Started by build flow  <a href="{0}/{1}">{2}</a>  build number <a href="{0}/{1}{3}">{3}</a>.
 message_no_build=Started by build flow  <a href="{0}/{1}">{2}</a>  build number {3}.
-message_no_job=Started by build flow  "{2}" build number {3}.
+message_no_job=Started by build flow  "{2}" build number {3}.
+caused_by=Originally caused by:

src/main/resources/com/cloudbees/plugins/flow/FlowCause/description.properties

@@ -52,6 +52,7 @@ class ConcurrencyTest extends DSLTestCase {
         BuildFlow flow = new BuildFlow(Jenkins.instance, getName())
         flow.concurrentBuild = true;
         flow.dsl = """  build("concjob1", param1: build.number)  """
+        flow.onCreatedFromScratch()
 
         def sfr1 = flow.scheduleBuild2(0)
         def fr1 = sfr1.waitForStart()

src/test/groovy/com/cloudbees/plugins/flow/ConcurrencyTest.groovy

@@ -0,0 +1,64 @@
+package com.cloudbees.plugins.flow
+
+import com.gargoylesoftware.htmlunit.html.HtmlPage
+import hudson.model.Cause
+import hudson.model.CauseAction
+import org.junit.Rule
+import org.junit.Test
+import org.jvnet.hudson.test.JenkinsRule
+
+import static org.junit.Assert.assertTrue
+
+class FlowCauseTest {
+
+    @Rule
+    public JenkinsRule j = new JenkinsRule()
+
+    protected BuildFlow createFlow(String name, String dsl) {
+        def job = j.jenkins.createProject(BuildFlow, name)
+        job.dsl = dsl
+        job.save()
+        return job
+    }
+
+    /**
+     * Given a pipeline A --> FLOW --> B, then the build for a B build must display Flow <-- A.
+     */
+    @Test
+    void 'Flow cause not blocking the upstream causes'() {
+        // Jobs
+        def a = createFlow('A', 'build("B")')
+        def b = createFlow('B', 'build("C")')
+        def c = createFlow('C', '')
+
+        // Triggers A
+        j.assertBuildStatusSuccess(a.scheduleBuild2(0, new Cause.UserIdCause()))
+
+        // Checks the builds
+        j.assertBuildStatusSuccess(b.builds.lastBuild)
+
+        // Last build in the sequence
+        def build = c.builds.lastBuild
+        j.assertBuildStatusSuccess(build)
+
+        // Checks the cause tree
+        def causeAction = build.actions.find { it instanceof CauseAction } as CauseAction
+        assert causeAction != null: "A cause action must be associated with the build"
+        assert causeAction.causes.size() == 1
+        def cause = causeAction.causes.first() as Cause.UpstreamCause
+        assert cause.shortDescription == 'Started by build flow B#1'
+        def upstreamCause = cause.upstreamCauses.first() as Cause.UpstreamCause
+        assert upstreamCause.shortDescription == 'Started by upstream project "A" build number 1'
+
+        // Goes to the build status page of C
+        HtmlPage page = j.createWebClient().goTo(c.builds.lastBuild.url)
+        assert page.titleText == 'C #1 [Jenkins]'
+
+        // Just checking the different causes are in the page (a bit primitive)
+        def bPosition = page.body.textContent.indexOf('Started by build flow  B')
+        assertTrue(bPosition > 0)
+        assertTrue(page.body.textContent.indexOf('Started by upstream project A build number 1') > bPosition)
+
+    }
+
+}