screwdriver-api 7.0.136 → 7.0.138

package/package.json

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

package/plugins/builds/index.js

@@ -34,7 +34,8 @@ const {
     createExternalEvent,
     getBuildsForGroupEvent,
     buildsToRestartFilter,
-    trimJobName
+    trimJobName,
+    getParallelBuilds
 } = require('./triggers/helpers');
 
 /**
@@ -140,6 +141,18 @@ async function triggerNextJobs(config, app) {
         // This includes CREATED builds too
         const groupEventBuilds =
             externalEvent !== undefined ? await getBuildsForGroupEvent(externalEvent.groupEventId, buildFactory) : [];
+
+        // fetch builds created due to trigger
+        if (externalEvent) {
+            const parallelBuilds = await getParallelBuilds({
+                eventFactory,
+                parentEventId: externalEvent.id,
+                pipelineId: externalEvent.pipelineId
+            });
+
+            groupEventBuilds.push(...parallelBuilds);
+        }
+
         const buildsToRestart = buildsToRestartFilter(joinedPipeline, groupEventBuilds, currentEvent, currentBuild);
         const isRestart = buildsToRestart.length > 0;
 

package/plugins/builds/triggers/helpers.js

@@ -464,8 +464,7 @@ function parseJobInfo({ joinObj, currentBuild, currentPipeline, currentJob, next
 
     return {
         parentBuilds,
-        joinListNames,
-        joinParentBuilds
+        joinListNames
     };
 }
 
@@ -480,11 +479,21 @@ async function getBuildsForGroupEvent(groupEventId, buildFactory) {
 
     builds.forEach(b => {
         try {
-            b.environment = JSON.parse(b.environment);
-            b.parentBuilds = JSON.parse(b.parentBuilds);
-            b.stats = JSON.parse(b.stats);
-            b.meta = JSON.parse(b.meta);
-            b.parentBuildId = JSON.parse(b.parentBuildId);
+            if (typeof b.environment === 'string') {
+                b.environment = JSON.parse(b.environment);
+            }
+            if (typeof b.parentBuilds === 'string') {
+                b.parentBuilds = JSON.parse(b.parentBuilds);
+            }
+            if (typeof b.stats === 'string') {
+                b.stats = JSON.parse(b.stats);
+            }
+            if (typeof b.meta === 'string') {
+                b.meta = JSON.parse(b.meta);
+            }
+            if (typeof b.parentBuildId === 'string') {
+                b.parentBuildId = JSON.parse(b.parentBuildId);
+            }
 
             if (b.parentBuildId) {
                 // parentBuildId could be the string '123', the number 123, or an array

package/plugins/builds/triggers/remoteJoin.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { getParallelBuilds, mergeParentBuilds, getParentBuildIds } = require('./helpers');
+const { mergeParentBuilds, getParentBuildIds } = require('./helpers');
 const { JoinBase } = require('./joinBase');
 
 /**
@@ -31,15 +31,6 @@ class RemoteJoin extends JoinBase {
      * @returns {Promise<Build|null>}
      */
     async execute(externalEvent, nextJobName, nextJobId, parentBuilds, groupEventBuilds, joinListNames) {
-        // fetch builds created due to trigger
-        const parallelBuilds = await getParallelBuilds({
-            eventFactory: this.eventFactory,
-            parentEventId: externalEvent.id,
-            pipelineId: externalEvent.pipelineId
-        });
-
-        groupEventBuilds.push(...parallelBuilds);
-
         // When restart case, should we create a new build ?
         const nextBuild = groupEventBuilds.find(b => b.jobId === nextJobId && b.eventId === externalEvent.id);