screwdriver-api 7.0.180 → 7.0.181

package/package.json

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

package/plugins/builds/triggers/and.js

@@ -86,8 +86,7 @@ class AndTrigger extends JoinBase {
             // If the build to join is in the child event, its event id is greater than current event.
             nextBuild = relatedBuilds.find(b => b.jobId === nextJobId && b.eventId > this.currentEvent.id);
         }
-
-        const newParentBuilds = mergeParentBuilds(parentBuilds, relatedBuilds, this.currentEvent);
+        const newParentBuilds = mergeParentBuilds(parentBuilds, relatedBuilds, this.currentEvent, undefined);
         let nextEvent = this.currentEvent;
 
         if (nextBuild) {

package/plugins/builds/triggers/helpers.js

@@ -668,6 +668,61 @@ async function getParallelBuilds({ eventFactory, parentEventId, pipelineId }) {
     return parallelBuilds;
 }
 
+/**
+ * Get subsequent job names which the root is the start from node
+ * @param   {Array}   [workflowGraph]         Array of graph vertices
+ * @param   {Array}   [workflowGraph.nodes]   Array of graph vertices
+ * @param   {Array}   [workflowGraph.edges]   Array of graph edges
+ * @param   {String}  [startNode]            Starting/trigger node
+ * @returns {Array<String>}                   subsequent job names
+ */
+function getSubsequentJobs(workflowGraph, startNode) {
+    const { nodes, edges } = workflowGraph;
+
+    // startNode can be a PR job in PR events, so trim PR prefix from node name
+    if (!startNode || !nodes.length) {
+        return [];
+    }
+    const nodeToEdgeDestsMap = Object.fromEntries(nodes.map(node => [node.name, []]));
+
+    let start = trimJobName(startNode);
+    // In rare cases, WorkflowGraph and startNode may have different start tildes
+
+    if (!(start in nodeToEdgeDestsMap)) {
+        if (start.startsWith('~')) {
+            start = start.slice(1);
+        } else {
+            start = `~${start}`;
+        }
+    }
+
+    if (!(start in nodeToEdgeDestsMap)) {
+        return [];
+    }
+
+    const visiting = [start];
+
+    const visited = new Set(visiting);
+
+    edges.forEach(edge => nodeToEdgeDestsMap[edge.src].push(edge.dest));
+    if (edges.length) {
+        while (visiting.length) {
+            const currentNode = visiting.pop();
+            const dests = nodeToEdgeDestsMap[currentNode];
+
+            dests.forEach(dest => {
+                if (!visited.has(dest)) {
+                    visiting.push(dest);
+                    visited.add(dest);
+                }
+            });
+        }
+    }
+    visited.delete(start);
+
+    return [...visited];
+}
+
 /**
  * Merge parentBuilds object with missing job information from latest builds object
  * @param {ParentBuilds} parentBuilds parent builds
@@ -692,6 +747,11 @@ async function getParallelBuilds({ eventFactory, parentEventId, pipelineId }) {
 function mergeParentBuilds(parentBuilds, relatedBuilds, currentEvent, nextEvent) {
     const newParentBuilds = {};
 
+    const ignoreJobs =
+        nextEvent && currentEvent.startFrom.startsWith('~')
+            ? getSubsequentJobs(nextEvent.workflowGraph, nextEvent.startFrom)
+            : getSubsequentJobs(currentEvent.workflowGraph, currentEvent.startFrom);
+
     Object.entries(parentBuilds).forEach(([pipelineId, { jobs, eventId }]) => {
         const newBuilds = {
             jobs,
@@ -708,7 +768,7 @@ function mergeParentBuilds(parentBuilds, relatedBuilds, currentEvent, nextEvent)
             let { workflowGraph } = currentEvent;
             let nodeName = trimJobName(jobName);
 
-            if (strToInt(pipelineId) !== currentEvent.pipelineId) {
+            if (strToInt(pipelineId) !== strToInt(currentEvent.pipelineId)) {
                 if (nextEvent) {
                     if (strToInt(pipelineId) !== nextEvent.pipelineId) {
                         nodeName = `sd@${pipelineId}:${nodeName}`;
@@ -718,7 +778,6 @@ function mergeParentBuilds(parentBuilds, relatedBuilds, currentEvent, nextEvent)
                     nodeName = `sd@${pipelineId}:${nodeName}`;
                 }
             }
-
             const targetJob = workflowGraph.nodes.find(node => node.name === nodeName);
 
             if (!targetJob) {
@@ -735,8 +794,10 @@ function mergeParentBuilds(parentBuilds, relatedBuilds, currentEvent, nextEvent)
                 return;
             }
 
-            newBuilds.jobs[jobName] = targetBuild.id;
-            newBuilds.eventId = targetBuild.eventId;
+            if (!ignoreJobs.includes(nodeName) || targetBuild.eventId === currentEvent.id) {
+                newBuilds.jobs[jobName] = targetBuild.id;
+                newBuilds.eventId = targetBuild.eventId;
+            }
         });
 
         newParentBuilds[pipelineId] = newBuilds;