screwdriver-api 8.0.127 → 8.0.129

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.127",
+  "version": "8.0.129",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -84,7 +84,7 @@
     "@hapi/hoek": "^11.0.0",
     "@hapi/inert": "^7.0.0",
     "@hapi/vision": "^7.0.0",
-    "@promster/hapi": "^14.0.0",
+    "@promster/hapi": "^15.0.0",
     "archiver": "^7.0.1",
     "async": "^3.2.4",
     "badge-maker": "^3.3.1",
@@ -168,16 +168,5 @@
     "rewiremock": "^3.14.4",
     "sinon": "^15.0.0",
     "stream-to-promise": "^3.0.0"
-  },
-  "overrides": {
-    "@mapbox/node-pre-gyp": {
-      "tar": "^7.5.9"
-    },
-    "sqlite3": {
-      "tar": "^7.5.9"
-    },
-    "ssh-keygen": {
-      "underscore": "^1.13.8"
-    }
   }
 }

package/plugins/builds/steps/logs.js

@@ -166,8 +166,8 @@ function unixToFullTime(timestamp, timeZone) {
     );
 
     const offsetMatch = timeZoneName.match(/GMT(.*)/)[1];
-
-    const timezoneOffset = offsetMatch === '' ? 'Z' : offsetMatch;
+    const isUtcOffset = offsetMatch === '' || offsetMatch === '+00:00' || offsetMatch === '-00:00';
+    const timezoneOffset = isUtcOffset ? 'Z' : offsetMatch;
 
     return `${year}-${month}-${day}T${hour}:${minute}:${second}.${fractionalSecond}${timezoneOffset}`;
 }

package/plugins/events/stopBuilds.js

@@ -8,6 +8,7 @@ const schema = require('screwdriver-data-schema');
 const getSchema = schema.models.event.get;
 const idSchema = schema.models.event.base.extract('id');
 const { deriveEventStatusFromBuildStatuses, stopBuilds } = require('../builds/helper/updateBuild');
+const { emitBuildStatusEvent } = require('../builds/triggers/helpers');
 const nonTerminatedStatus = ['CREATED', 'RUNNING', 'QUEUED', 'BLOCKED', 'FROZEN'];
 
 module.exports = () => ({
@@ -89,15 +90,26 @@ module.exports = () => ({
             const statusMessage = `Aborted event by ${username}`;
 
             const { unchangedBuilds, changedBuilds } = stopBuilds(builds, statusMessage);
-            const updatedBuilds = [...unchangedBuilds, ...(await Promise.all(changedBuilds.map(b => b.update())))];
+            const updatedBuilds = await Promise.all(changedBuilds.map(b => b.update()));
+            const updatedAllBuilds = [...unchangedBuilds, ...updatedBuilds];
 
-            const newEventStatus = deriveEventStatusFromBuildStatuses(updatedBuilds);
+            const newEventStatus = deriveEventStatusFromBuildStatuses(updatedAllBuilds);
 
             if (newEventStatus && event.status !== newEventStatus) {
                 event.status = newEventStatus;
                 await event.update();
             }
 
+            const abortedBuilds = updatedBuilds.filter(build => build.status === 'ABORTED');
+
+            const buildNotifies = abortedBuilds.map(async build => {
+                const job = await build.job;
+
+                return emitBuildStatusEvent({ server: request.server, build, pipeline, event, job });
+            });
+
+            await Promise.all(buildNotifies);
+
             // Update stageBuild status to ABORTED
             const stageBuilds = await event.getStageBuilds();
             const toUpdateStageBuilds = [];