screwdriver-api 8.0.98 → 8.0.99

package/package.json

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

package/plugins/builds/helper/updateBuild.js

@@ -6,7 +6,7 @@ const merge = require('lodash.mergewith');
 const isEmpty = require('lodash.isempty');
 const { PR_JOB_NAME, PR_STAGE_NAME, STAGE_TEARDOWN_PATTERN } = require('screwdriver-data-schema').config.regex;
 const { getFullStageJobName } = require('../../helper');
-const { updateVirtualBuildSuccess, emitBuildStatusEvent } = require('../triggers/helpers');
+const { updateVirtualBuildSuccess, emitBuildStatusEvent, isFixedBuild } = require('../triggers/helpers');
 const TERMINAL_STATUSES = ['FAILURE', 'ABORTED', 'UNSTABLE', 'COLLAPSED'];
 const FINISHED_STATUSES = ['SUCCESS', ...TERMINAL_STATUSES];
 const NON_TERMINATED_STATUSES = ['CREATED', 'RUNNING', 'QUEUED', 'BLOCKED', 'FROZEN'];
@@ -412,12 +412,14 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
         stopFrozen = stopFrozenBuild(build, currentStatus);
     }
 
-    const [newBuild, newEvent] = await Promise.all([build.update(), event.update(), stopFrozen]);
-    const job = await newBuild.job;
+    const job = await build.job;
     const pipeline = await job.pipeline;
+    const isFixed = await isFixedBuild({ build, job });
+
+    const [newBuild, newEvent] = await Promise.all([build.update(), event.update(), stopFrozen]);
 
     if (desiredStatus) {
-        await emitBuildStatusEvent({ server, build: newBuild, pipeline, event: newEvent, job });
+        await emitBuildStatusEvent({ server, build: newBuild, pipeline, event: newEvent, job, isFixed });
     }
 
     const skipFurther = /\[(skip further)\]/.test(newEvent.causeMessage);

package/plugins/builds/triggers/helpers.js

@@ -630,6 +630,27 @@ async function getParentBuildStatus({ joinListNames, joinBuilds }) {
     return { hasFailure, done };
 }
 
+/**
+ * Identify whether this build resulted in a previously failed job to become successful.
+ *
+ * @method isFixedBuild
+ * @param  {Build}     build  Build Object
+ * @param  {Job}       job    Job Object
+ * @return {Promise<Boolean>}
+ */
+async function isFixedBuild({ build, job }) {
+    if (build.status !== Status.SUCCESS) {
+        return false;
+    }
+
+    job = job || (await build.job); // eslint-disable-line no-param-reassign
+
+    const failureBuild = await job.getLatestBuild({ status: Status.FAILURE });
+    const successBuild = await job.getLatestBuild({ status: Status.SUCCESS });
+
+    return !!((failureBuild && !successBuild) || failureBuild.id > successBuild.id);
+}
+
 /**
  * Emit 'build_status' event to notify
  * @param {Object} arg
@@ -640,23 +661,13 @@ async function getParentBuildStatus({ joinListNames, joinBuilds }) {
  * @param {Job} [arg.job] Job
  * @returns {Promise}
  */
-async function emitBuildStatusEvent({ server, build, pipeline, event, job }) {
+async function emitBuildStatusEvent({ server, build, pipeline, event, job, isFixed = false }) {
     const { buildFactory } = server.app;
 
     event = event || (await build.event); // eslint-disable-line no-param-reassign
     job = job || (await build.job); // eslint-disable-line no-param-reassign
     pipeline = pipeline || (await job.pipeline); // eslint-disable-line no-param-reassign
 
-    let isFixed = false;
-
-    if (build.status === Status.SUCCESS) {
-        const failureBuild = await job.getLatestBuild({ status: Status.FAILURE });
-        const successBuild = await job.getLatestBuild({ status: Status.SUCCESS });
-
-        // Identify whether this build resulted in a previously failed job to become successful.
-        isFixed = !!((failureBuild && !successBuild) || failureBuild.id > successBuild.id);
-    }
-
     return server.events.emit('build_status', {
         settings: job.permutations[0].settings,
         status: build.status,
@@ -1282,6 +1293,7 @@ module.exports = {
     getJoinBuilds,
     getParentBuildStatus,
     handleNewBuild,
+    isFixedBuild,
     emitBuildStatusEvent,
     ensureStageTeardownBuildExists,
     getBuildsForGroupEvent,