screwdriver-api 7.0.230 → 7.0.231

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "7.0.230",
+  "version": "7.0.231",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {

package/plugins/builds/triggers/helpers.js

@@ -294,6 +294,7 @@ async function createExternalEvent(config) {
  * @param {Boolean} config.start Whether to start the build or not
  * @param {Number|undefined} config.jobId Job ID
  * @param {EventModel} config.event Event build belongs to
+ * @param {String} config.causeMessage Reason the event is run
  * @returns {Promise<BuildModel|null>}
  */
 async function createInternalBuild(config) {
@@ -309,7 +310,8 @@ async function createInternalBuild(config) {
         start,
         baseBranch,
         parentBuildId,
-        jobId
+        jobId,
+        causeMessage
     } = config;
     const { ref = '', prSource = '', prBranchName = '', url = '' } = event.pr || {};
     const prInfo = prBranchName ? { url, prBranchName } : '';
@@ -334,7 +336,8 @@ async function createInternalBuild(config) {
         prSource,
         prInfo,
         start: start !== false,
-        baseBranch
+        baseBranch,
+        causeMessage
     };
 
     let jobState = job.state;
@@ -609,9 +612,10 @@ async function getParentBuildStatus({ newBuild, joinListNames, pipelineId, build
  * @param {String|undefined} arg.pipelineId Pipeline ID
  * @param {String|undefined} arg.stageName Stage name
  * @param {Boolean} arg.isVirtualJob If the job is virtual or not
+ * @param {Event} arg.event Event
  * @returns {Promise<Build|null>} The newly updated/created build
  */
-async function handleNewBuild({ done, hasFailure, newBuild, job, pipelineId, stageName, isVirtualJob }) {
+async function handleNewBuild({ done, hasFailure, newBuild, job, pipelineId, stageName, isVirtualJob, event }) {
     if (!done || Status.isStarted(newBuild.status)) {
         return null;
     }
@@ -647,7 +651,9 @@ async function handleNewBuild({ done, hasFailure, newBuild, job, pipelineId, sta
     newBuild.status = Status.QUEUED;
     await newBuild.update();
 
-    return newBuild.start();
+    const causeMessage = job.name === event.startFrom ? event.causeMessage : '';
+
+    return newBuild.start({ causeMessage });
 }
 
 /**

package/plugins/builds/triggers/joinBase.js

@@ -105,7 +105,8 @@ class JoinBase {
             job: nextJob,
             pipelineId,
             isVirtualJob: isNextJobVirtual,
-            stageName: nextJobStageName
+            stageName: nextJobStageName,
+            event
         });
     }
 }

package/plugins/builds/triggers/orBase.js

@@ -50,6 +50,8 @@ class OrBase {
         const hasFreezeWindows =
             nextJob.permutations[0].freezeWindows && nextJob.permutations[0].freezeWindows.length > 0;
 
+        const causeMessage = nextJob.name === event.startFrom ? event.causeMessage : '';
+
         if (nextBuild !== null) {
             if (Status.isStarted(nextBuild.status)) {
                 return nextBuild;
@@ -67,7 +69,7 @@ class OrBase {
             nextBuild.status = Status.QUEUED;
             await nextBuild.update();
 
-            return nextBuild.start();
+            return nextBuild.start({ causeMessage });
         }
 
         nextBuild = await createInternalBuild({
@@ -82,7 +84,8 @@ class OrBase {
             baseBranch: event.baseBranch || null,
             parentBuilds,
             parentBuildId: this.currentBuild.id,
-            start: hasFreezeWindows || !isNextJobVirtual
+            start: hasFreezeWindows || !isNextJobVirtual,
+            causeMessage
         });
 
         // Bypass execution of the build if the job is virtual