screwdriver-api 8.0.115 → 8.0.116

package/package.json

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

package/plugins/builds/triggers/helpers.js

@@ -139,6 +139,17 @@ function hasFreezeWindows(job) {
     return freezeWindows ? freezeWindows.length > 0 : false;
 }
 
+/**
+ * Checks if job has blockedBy
+ * @param {Job} job Job object
+ * @returns {Boolean}
+ */
+function hasBlockedBy(job) {
+    const { blockedBy } = job.permutations[0];
+
+    return blockedBy ? blockedBy.length > 0 : false;
+}
+
 /**
  * Get external pipelineId and job name from the `name`
  * @param {String} name Job name
@@ -771,7 +782,7 @@ async function handleNewBuild({
     newBuild.parentBuildId = parentBuilds.map(build => build.id);
 
     // Bypass execution of the build if the job is virtual
-    if (isVirtualJob && !hasFreezeWindows(job)) {
+    if (isVirtualJob && !hasFreezeWindows(job) && !hasBlockedBy(job)) {
         return updateVirtualBuildSuccess({ server, build: newBuild, event, job });
     }
 
@@ -1310,6 +1321,7 @@ module.exports = {
     trimJobName,
     isStartFromMiddleOfCurrentStage,
     hasFreezeWindows,
+    hasBlockedBy,
     getNextJobStageName,
     updateVirtualBuildSuccess,
     BUILD_STATUS_MESSAGES

package/plugins/builds/triggers/orBase.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { createInternalBuild, Status, updateVirtualBuildSuccess, hasFreezeWindows } = require('./helpers');
+const { createInternalBuild, Status, updateVirtualBuildSuccess, hasFreezeWindows, hasBlockedBy } = require('./helpers');
 
 /**
  * @typedef {import('screwdriver-models').BuildFactory} BuildFactory
@@ -49,6 +49,7 @@ class OrBase {
         });
 
         const hasWindows = hasFreezeWindows(nextJob);
+        const hasBlocked = hasBlockedBy(nextJob);
         const causeMessage = nextJob.name === event.startFrom ? event.causeMessage : '';
 
         if (nextBuild !== null) {
@@ -59,7 +60,7 @@ class OrBase {
             nextBuild.parentBuildId = [this.currentBuild.id];
 
             // Bypass execution of the build if the job is virtual
-            if (isNextJobVirtual && !hasWindows) {
+            if (isNextJobVirtual && !hasWindows && !hasBlocked) {
                 return updateVirtualBuildSuccess({ server: this.server, build: nextBuild, event, job: nextJob });
             }
 
@@ -81,12 +82,12 @@ class OrBase {
             baseBranch: event.baseBranch || null,
             parentBuilds,
             parentBuildId: this.currentBuild.id,
-            start: hasWindows || !isNextJobVirtual,
+            start: hasBlocked || hasWindows || !isNextJobVirtual,
             causeMessage
         });
 
         // Bypass execution of the build if the job is virtual
-        if (isNextJobVirtual && !hasWindows) {
+        if (isNextJobVirtual && !hasWindows && !hasBlocked) {
             await updateVirtualBuildSuccess({ server: this.server, build: nextBuild, event, job: nextJob });
         }
 

package/plugins/events/helper/createEvent.js

@@ -21,7 +21,19 @@ function getVirtualJobIds(virtualNodeNames, prJobs) {
         const prJobName = prJob.name.match(PR_JOB_NAME);
         const nodeName = prJobName ? prJobName[2] : prJob.name;
 
+        // if prJob has blockedBy or freezeWindows annotation
+        // then it needs to be queued for scheduling
         if (virtualNodeNames.includes(nodeName)) {
+            const permutations = prJob.permutations || [];
+            const hasBlockedBy = permutations[0] && permutations[0].blockedBy;
+            const hasFreezeWindows = permutations[0] && permutations[0].freezeWindows;
+
+            const needsScheduling = Boolean(hasBlockedBy || hasFreezeWindows);
+
+            if (needsScheduling) {
+                return;
+            }
+
             virtualJobIds.push(prJob.id);
         }
     });