screwdriver-api 6.0.40 → 6.0.41

package/package.json

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

package/plugins/builds/index.js

@@ -528,29 +528,27 @@ async function getParentBuildStatus({ newBuild, joinListNames, pipelineId, build
  * @return {Promise}                The newly updated/created build
  */
 async function handleNewBuild({ done, hasFailure, newBuild, jobName, pipelineId }) {
-    if (!done) {
-        return null;
-    }
-    if (!['CREATED', null, undefined].includes(newBuild.status)) {
-        return null;
-    }
+    if (done) {
+        // Delete new build since previous build failed
+        if (hasFailure) {
+            logger.info(
+                `Failure occurred in upstream job, removing new build - build:${newBuild.id} pipeline:${pipelineId}-${jobName} event:${newBuild.eventId} `
+            );
+            await newBuild.remove();
+
+            return null;
+        }
 
-    // Delete new build since previous build failed
-    if (hasFailure) {
-        logger.info(
-            `Failure occurred in upstream job, removing new build - build:${newBuild.id} pipeline:${pipelineId}-${jobName} event:${newBuild.eventId} `
-        );
-        await newBuild.remove();
+        // If all join builds finished successfully and it's clear that a new build has not been started before, start new build
+        if (['CREATED', null, undefined].includes(newBuild.status)) {
+            newBuild.status = 'QUEUED';
+            const queuedBuild = await newBuild.update();
 
-        return null;
+            return queuedBuild.start();
+        }
     }
 
-    // All join builds finished successfully and it's clear that a new build has not been started before.
-    // Start new build.
-    newBuild.status = 'QUEUED';
-    await newBuild.update();
-
-    return newBuild.start();
+    return null;
 }
 
 /**
@@ -832,29 +830,18 @@ const buildsPlugin = {
                         parentBuilds,
                         parentBuildId: current.build.id
                     };
+                    let newBuild;
 
-                    const nextJob = await jobFactory.get({
-                        name: nextJobName,
-                        pipelineId: current.pipeline.id
-                    });
-
-                    const existNextBuild = await buildFactory.get({
-                        eventId: current.event.id,
-                        jobId: nextJob.id
-                    });
-
-                    if (existNextBuild === null) {
-                        return createInternalBuild(internalBuildConfig);
-                    }
-
-                    if (!['CREATED', null, undefined].includes(existNextBuild.status)) {
-                        return existNextBuild;
+                    try {
+                        newBuild = await createInternalBuild(internalBuildConfig);
+                    } catch (err) {
+                        logger.error(
+                            `Error in triggerNextJobs - pipeline:${current.pipeline.id}-${nextJobName} event:${event.id} `,
+                            err
+                        );
                     }
 
-                    existNextBuild.status = 'QUEUED';
-                    await existNextBuild.update();
-
-                    return existNextBuild.start();
+                    return newBuild;
                 }
 
                 logger.info(`Fetching finished builds for event ${event.id}`);