screwdriver-api 8.0.41 → 8.0.43

package/package.json

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

package/plugins/builds/helper/updateBuild.js

@@ -5,6 +5,7 @@ const hoek = require('@hapi/hoek');
 const merge = require('lodash.mergewith');
 const { PR_JOB_NAME, PR_STAGE_NAME, STAGE_TEARDOWN_PATTERN } = require('screwdriver-data-schema').config.regex;
 const { getFullStageJobName } = require('../../helper');
+const { updateVirtualBuildSuccess } = require('../triggers/helpers');
 const TERMINAL_STATUSES = ['FAILURE', 'ABORTED', 'UNSTABLE', 'COLLAPSED'];
 const FINISHED_STATUSES = ['FAILURE', 'SUCCESS', 'ABORTED', 'UNSTABLE', 'COLLAPSED'];
 
@@ -381,12 +382,18 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
             const stageIsDone = isStageDone(stageJobBuilds);
 
             if (stageIsDone) {
-                stageTeardownBuild.status = 'QUEUED';
+                const teardownNode = newEvent.workflowGraph.nodes.find(n => n.id === stageTeardownJob.id);
+
                 stageTeardownBuild.parentBuildId = stageJobBuilds.map(b => b.id);
 
-                // TODO: Handle if a teardown job is virtual
-                await stageTeardownBuild.update();
-                await stageTeardownBuild.start();
+                if (teardownNode && teardownNode.virtual) {
+                    await updateVirtualBuildSuccess(stageTeardownBuild);
+                } else {
+                    stageTeardownBuild.status = 'QUEUED';
+
+                    await stageTeardownBuild.update();
+                    await stageTeardownBuild.start();
+                }
             }
         }
     }

package/plugins/builds/triggers/helpers.js

@@ -606,6 +606,21 @@ async function getParentBuildStatus({ joinListNames, joinBuilds }) {
     return { hasFailure, done };
 }
 
+/**
+ * Update virtual build status to SUCCESS and init metadata
+ * @param {Build} build
+ * @returns {Promise<Build>}
+ */
+async function updateVirtualBuildSuccess(build) {
+    build.status = Status.SUCCESS;
+    build.statusMessage = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessage;
+    build.statusMessageType = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessageType;
+
+    await build.initMeta();
+
+    return build.update();
+}
+
 /**
  * Handle new build logic: update, start, or remove
  * If the build is done, check if it has a failure:
@@ -668,27 +683,11 @@ async function handleNewBuild({
     /* Prepare to execute the build */
     const parentBuilds = Object.values(joinBuilds);
 
-    parentBuilds.sort((l, r) => {
-        if (l.endTime && r.endTime) {
-            return l.endTime.getTime() - r.endTime.getTime();
-        }
-
-        // Move to tail if endTime is not set
-        return (l.endTime ? 0 : 1) - (r.endTime ? 0 : 1);
-    });
     newBuild.parentBuildId = parentBuilds.map(build => build.id);
 
     // Bypass execution of the build if the job is virtual
     if (isVirtualJob && !hasFreezeWindows(job)) {
-        newBuild.status = Status.SUCCESS;
-        newBuild.statusMessage = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessage;
-        newBuild.statusMessageType = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessageType;
-
-        // The virtual job does not inherit metadata because the Launcher is not executed.
-        // Therefore, it is necessary to take over the metadata from the previous build.
-        newBuild.meta = parentBuilds.reduce((acc, build) => merge(acc, build.meta), {});
-
-        return newBuild.update();
+        return updateVirtualBuildSuccess(newBuild);
     }
 
     // All join builds finished successfully, and it's clear that a new build has not been started before.
@@ -1220,5 +1219,6 @@ module.exports = {
     isStartFromMiddleOfCurrentStage,
     hasFreezeWindows,
     getNextJobStageName,
+    updateVirtualBuildSuccess,
     BUILD_STATUS_MESSAGES
 };

package/plugins/builds/triggers/orBase.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const merge = require('lodash.mergewith');
-const { createInternalBuild, Status, BUILD_STATUS_MESSAGES, hasFreezeWindows } = require('./helpers');
+const { createInternalBuild, Status, updateVirtualBuildSuccess, hasFreezeWindows } = require('./helpers');
 
 /**
  * @typedef {import('screwdriver-models').BuildFactory} BuildFactory
@@ -60,14 +59,7 @@ class OrBase {
 
             // Bypass execution of the build if the job is virtual
             if (isNextJobVirtual && !hasWindows) {
-                nextBuild.status = Status.SUCCESS;
-                nextBuild.statusMessage = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessage;
-                nextBuild.statusMessageType = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessageType;
-
-                // Overwrite metadata by current build's
-                nextBuild.meta = merge({}, this.currentBuild.meta);
-
-                return nextBuild.update();
+                return updateVirtualBuildSuccess(nextBuild);
             }
 
             nextBuild.status = Status.QUEUED;
@@ -94,14 +86,7 @@ class OrBase {
 
         // Bypass execution of the build if the job is virtual
         if (isNextJobVirtual && !hasWindows) {
-            nextBuild.status = Status.SUCCESS;
-            nextBuild.statusMessage = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessage;
-            nextBuild.statusMessageType = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessageType;
-
-            // Overwrite metadata by current build's
-            nextBuild.meta = merge({}, this.currentBuild.meta);
-
-            await nextBuild.update();
+            await updateVirtualBuildSuccess(nextBuild);
         }
 
         return nextBuild;