screwdriver-api 7.0.146 → 7.0.147

package/package.json

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

package/plugins/builds/index.js

@@ -93,7 +93,7 @@ async function triggerNextJobs(config, app) {
     for (const [nextJobName, nextJob] of Object.entries(currentPipelineNextJobs)) {
         const nextJobId = nextJob.id || (await getJobId(nextJobName, currentPipeline.id, jobFactory));
         const { isVirtual: isNextJobVirtual, stageName: nextJobStageName } = nextJob;
-        const resource = `pipeline:${currentPipeline.id}:event:${currentEvent.id}`;
+        const resource = `pipeline:${currentPipeline.id}:groupEvent:${currentEvent.groupEventId}`;
         let lock;
         let nextBuild;
 

package/plugins/builds/triggers/and.js

@@ -82,11 +82,21 @@ class AndTrigger extends JoinBase {
             }
         }
 
+        if (!nextBuild) {
+            // 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);
+        let nextEvent = this.currentEvent;
+
+        if (nextBuild) {
+            nextEvent = await this.eventFactory.get({ id: nextBuild.eventId });
+        }
 
         return this.processNextBuild({
             pipelineId: this.pipelineId,
-            event: this.currentEvent,
+            event: nextEvent,
             nextBuild,
             nextJobName,
             nextJobId,