npm - screwdriver-api - Versions diffs - 7.0.49 → 7.0.51 - Mend

screwdriver-api 7.0.49 → 7.0.51

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/plugins/builds/index.js +25 -16

package/package.json CHANGED Viewed

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

package/plugins/builds/index.js CHANGED Viewed

@@ -845,7 +845,7 @@ const buildsPlugin = {
                  */
                 const isORTrigger = !joinListNames.includes(current.job.name);
-                if (joinListNames.length === 0 || isORTrigger) {
+                if (isORTrigger) {
                     const internalBuildConfig = {
                         jobFactory,
                         buildFactory,
@@ -1048,6 +1048,7 @@ const buildsPlugin = {
                         const joinList = nextJobs[nextJobName].join;
                         const joinListNames = joinList.map(j => j.name);
+                        const isORTrigger = !joinListNames.includes(triggerName);
                         if (nextBuild) {
                             // update current build info in parentBuilds
@@ -1083,22 +1084,30 @@ const buildsPlugin = {
                             });
                         }
-                        const { hasFailure, done } = await getParentBuildStatus({
-                            newBuild,
-                            joinListNames,
-                            pipelineId: externalPipelineId,
-                            buildFactory
-                        });
+                        if (isORTrigger) {
+                            if (['CREATED', null, undefined].includes(newBuild.status)) {
+                                newBuild.status = 'QUEUED';
+                                await newBuild.update();
+                                await newBuild.start();
+                            }
+                        } else {
+                            const { hasFailure, done } = await getParentBuildStatus({
+                                newBuild,
+                                joinListNames,
+                                pipelineId: externalPipelineId,
+                                buildFactory
+                            });
-                        // Check if external pipeline has Join
-                        // and join conditions are met
-                        await handleNewBuild({
-                            done,
-                            hasFailure,
-                            newBuild,
-                            jobName: nextJobName,
-                            pipelineId: externalPipelineId
-                        });
+                            // Check if external pipeline has Join
+                            // and join conditions are met
+                            await handleNewBuild({
+                                done,
+                                hasFailure,
+                                newBuild,
+                                jobName: nextJobName,
+                                pipelineId: externalPipelineId
+                            });
+                        }
                     }
                     return null;