screwdriver-api 8.0.9 → 8.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.9",
+  "version": "8.0.10",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -111,7 +111,7 @@
     "screwdriver-config-parser": "^12.0.0",
     "screwdriver-coverage-bookend": "^3.0.0",
     "screwdriver-coverage-sonar": "^5.0.0",
-    "screwdriver-data-schema": "^25.1.0",
+    "screwdriver-data-schema": "^25.1.3",
     "screwdriver-datastore-sequelize": "^10.0.0",
     "screwdriver-executor-base": "^11.0.0",
     "screwdriver-executor-docker": "^8.0.1",

package/plugins/builds/index.js

@@ -39,8 +39,7 @@ const {
     getParallelBuilds,
     isStartFromMiddleOfCurrentStage,
     Status,
-    getSameParentEvents,
-    isVirtualJob
+    getSameParentEvents
 } = require('./triggers/helpers');
 const { getFullStageJobName } = require('../helper');
 
@@ -96,9 +95,11 @@ async function triggerNextJobs(config, app) {
 
     const downstreamOfNextJobsToBeProcessed = [];
 
-    for (const [nextJobName, nextJobInfo] of Object.entries(currentPipelineNextJobs)) {
+    for (const [nextJobName] of Object.entries(currentPipelineNextJobs)) {
         const nextJob = await getJob(nextJobName, currentPipeline.id, jobFactory);
-        const { stageName: nextJobStageName } = nextJobInfo;
+        const node = currentEvent.workflowGraph.nodes.find(n => n.name === trimJobName(nextJobName));
+        const isNextJobVirtual = node.virtual || false;
+        const nextJobStageName = node.stageName || null;
         const resource = `pipeline:${currentPipeline.id}:groupEvent:${currentEvent.groupEventId}`;
         let lock;
         let nextBuild;
@@ -124,12 +125,24 @@ async function triggerNextJobs(config, app) {
                 isOrTrigger(currentEvent.workflowGraph, originalCurrentJobName, trimJobName(nextJobName)) ||
                 isStartFromMiddleOfCurrentStage(currentJob.name, currentEvent.startFrom, currentEvent.workflowGraph)
             ) {
-                nextBuild = await orTrigger.execute(currentEvent, currentPipeline.id, nextJob, parentBuilds);
+                nextBuild = await orTrigger.execute(
+                    currentEvent,
+                    currentPipeline.id,
+                    nextJob,
+                    parentBuilds,
+                    isNextJobVirtual
+                );
             } else {
-                nextBuild = await andTrigger.execute(nextJob, parentBuilds, joinListNames, nextJobStageName);
+                nextBuild = await andTrigger.execute(
+                    nextJob,
+                    parentBuilds,
+                    joinListNames,
+                    isNextJobVirtual,
+                    nextJobStageName
+                );
             }
 
-            if (isVirtualJob(nextJob) && nextBuild && nextBuild.status === Status.SUCCESS) {
+            if (isNextJobVirtual && nextBuild && nextBuild.status === Status.SUCCESS) {
                 downstreamOfNextJobsToBeProcessed.push({
                     build: nextBuild,
                     event: currentEvent,
@@ -274,7 +287,9 @@ async function triggerNextJobs(config, app) {
         if (externalEvent) {
             for (const [nextJobName, nextJobInfo] of Object.entries(joinedPipeline.jobs)) {
                 const nextJob = await getJob(nextJobName, joinedPipelineId, jobFactory);
-                const { stageName: nextJobStageName } = nextJobInfo;
+                const node = externalEvent.workflowGraph.nodes.find(n => n.name === trimJobName(nextJobName));
+                const isNextJobVirtual = node.virtual || false;
+                const nextJobStageName = node.stageName || null;
 
                 const { parentBuilds } = parseJobInfo({
                     joinObj: joinedPipeline.jobs,
@@ -295,7 +310,8 @@ async function triggerNextJobs(config, app) {
                             externalEvent,
                             externalEvent.pipelineId,
                             nextJob,
-                            parentBuilds
+                            parentBuilds,
+                            isNextJobVirtual
                         );
                     } else {
                         // Re get join list when first time remote trigger since external event was empty and cannot get workflow graph then
@@ -311,11 +327,12 @@ async function triggerNextJobs(config, app) {
                             parentBuilds,
                             groupEventBuilds,
                             joinListNames,
+                            isNextJobVirtual,
                             nextJobStageName
                         );
                     }
 
-                    if (isVirtualJob(nextJob) && nextBuild && nextBuild.status === Status.SUCCESS) {
+                    if (isNextJobVirtual && nextBuild && nextBuild.status === Status.SUCCESS) {
                         downstreamOfNextJobsToBeProcessed.push({
                             build: nextBuild,
                             event: currentEvent,

package/plugins/builds/triggers/helpers.js

@@ -128,17 +128,6 @@ function isExternalTrigger(jobName) {
     return EXTERNAL_TRIGGER_ALL.test(jobName);
 }
 
-/**
- * Checks if job is virtual
- * @param {Job} job Job object
- * @returns {Boolean}
- */
-function isVirtualJob(job) {
-    const { annotations } = job.permutations[0];
-
-    return annotations ? annotations['screwdriver.cd/virtualJob'] === true : false;
-}
-
 /**
  * Checks if job has freezeWindows
  * @param {Job} job Job object
@@ -633,18 +622,29 @@ async function getParentBuildStatus({ newBuild, joinListNames, pipelineId, build
  * @param {Job} arg.job Next job
  * @param {String|undefined} arg.pipelineId Pipeline ID
  * @param {String|undefined} arg.stageName Stage name
+ * @param {Boolean} arg.isVirtualJob If the job is virtual or not
  * @param {Event} arg.event Event
  * @param {Build} arg.currentBuild Current build
  * @returns {Promise<Build|null>} The newly updated/created build
  */
-async function handleNewBuild({ done, hasFailure, newBuild, job, pipelineId, stageName, event, currentBuild }) {
+async function handleNewBuild({
+    done,
+    hasFailure,
+    newBuild,
+    job,
+    pipelineId,
+    stageName,
+    isVirtualJob,
+    event,
+    currentBuild
+}) {
     if (!done || Status.isStarted(newBuild.status)) {
         // 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.
 
         // TODO There is a bug when virtual job requires [a, b] and if "a" and "b" are completed simultaneously.
         // https://github.com/screwdriver-cd/screwdriver/issues/3287
-        if (isVirtualJob(job) && !hasFreezeWindows(job)) {
+        if (isVirtualJob && !hasFreezeWindows(job)) {
             newBuild.meta = merge({}, newBuild.meta, currentBuild.meta);
 
             await newBuild.update();
@@ -669,7 +669,7 @@ async function handleNewBuild({ done, hasFailure, newBuild, job, pipelineId, sta
     }
 
     // Bypass execution of the build if the job is virtual
-    if (isVirtualJob(job) && !hasFreezeWindows(job)) {
+    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;
@@ -934,9 +934,7 @@ async function createJoinObject(nextJobNames, current, eventFactory) {
             isExternal = true;
         }
 
-        const node = event.workflowGraph.nodes.find(n => n.name === trimJobName(jobName));
-        const jId = node.id;
-        const stageName = node.stageName || null;
+        const jId = event.workflowGraph.nodes.find(n => n.name === trimJobName(jobName)).id;
 
         if (!joinObj[nextJobPipelineId]) joinObj[nextJobPipelineId] = {};
         const pipelineObj = joinObj[nextJobPipelineId];
@@ -956,7 +954,7 @@ async function createJoinObject(nextJobNames, current, eventFactory) {
         }
 
         if (!pipelineObj.jobs) pipelineObj.jobs = {};
-        pipelineObj.jobs[nextJobName] = { id: jId, join: jobs, isExternal, stageName };
+        pipelineObj.jobs[nextJobName] = { id: jId, join: jobs, isExternal };
     }
 
     return joinObj;
@@ -1225,7 +1223,6 @@ module.exports = {
     buildsToRestartFilter,
     trimJobName,
     isStartFromMiddleOfCurrentStage,
-    isVirtualJob,
     hasFreezeWindows,
     BUILD_STATUS_MESSAGES
 };

package/plugins/builds/triggers/joinBase.js

@@ -43,6 +43,7 @@ class JoinBase {
      * @param {import('./helpers').ParentBuilds} parentBuilds
      * @param {String} parentBuildId
      * @param {String[]} joinListNames
+     * @param {Boolean} isNextJobVirtual
      * @param {String} nextJobStageName
      * @returns {Promise<Build[]|null>}
      */
@@ -54,6 +55,7 @@ class JoinBase {
         parentBuilds,
         parentBuildId,
         joinListNames,
+        isNextJobVirtual,
         nextJobStageName
     }) {
         let newBuild;
@@ -102,6 +104,7 @@ class JoinBase {
             newBuild,
             job: nextJob,
             pipelineId,
+            isVirtualJob: isNextJobVirtual,
             stageName: nextJobStageName,
             event,
             currentBuild: this.currentBuild

package/plugins/builds/triggers/orBase.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const merge = require('lodash.mergewith');
-const { createInternalBuild, Status, BUILD_STATUS_MESSAGES, isVirtualJob, hasFreezeWindows } = require('./helpers');
+const { createInternalBuild, Status, BUILD_STATUS_MESSAGES, hasFreezeWindows } = require('./helpers');
 
 /**
  * @typedef {import('screwdriver-models').BuildFactory} BuildFactory
@@ -39,15 +39,15 @@ class OrBase {
      * @param {Number} pipelineId
      * @param {Job} nextJob
      * @param {import('./helpers').ParentBuilds} parentBuilds
+     * @param {Boolean} isNextJobVirtual
      * @return {Promise<Build|null>}
      */
-    async trigger(event, pipelineId, nextJob, parentBuilds) {
+    async trigger(event, pipelineId, nextJob, parentBuilds, isNextJobVirtual) {
         let nextBuild = await this.buildFactory.get({
             eventId: event.id,
             jobId: nextJob.id
         });
 
-        const isNextJobVirtual = isVirtualJob(nextJob);
         const hasWindows = hasFreezeWindows(nextJob);
         const causeMessage = nextJob.name === event.startFrom ? event.causeMessage : '';