screwdriver-api 7.0.145 → 7.0.147

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "7.0.145",
+  "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;
 
@@ -224,76 +224,87 @@ async function triggerNextJobs(config, app) {
                 externalEventConfig.parentBuilds = buildsToRestart[0].parentBuilds;
             }
 
-            externalEvent = await createExternalEvent(externalEventConfig);
+            try {
+                externalEvent = await createExternalEvent(externalEventConfig);
+            } catch (err) {
+                // The case of triggered external pipeline which is already deleted from DB, etc
+                logger.error(
+                    `Error in createExternalEvent:${joinedPipelineId} from pipeline:${currentPipeline.id}-${currentJob.name}-event:${currentEvent.id}`,
+                    err
+                );
+            }
         }
 
-        for (const [nextJobName, nextJob] of Object.entries(joinedPipeline.jobs)) {
-            const nextJobId = nextJob.id || (await getJobId(nextJobName, currentPipeline.id, jobFactory));
-            const { isVirtual: isNextJobVirtual, stageName: nextJobStageName } = nextJob;
+        // Skip trigger process if createExternalEvent fails
+        if (externalEvent) {
+            for (const [nextJobName, nextJob] of Object.entries(joinedPipeline.jobs)) {
+                const nextJobId = nextJob.id || (await getJobId(nextJobName, currentPipeline.id, jobFactory));
+                const { isVirtual: isNextJobVirtual, stageName: nextJobStageName } = nextJob;
+
+                const { parentBuilds } = parseJobInfo({
+                    joinObj: joinedPipeline.jobs,
+                    currentBuild,
+                    currentPipeline,
+                    currentJob,
+                    nextJobName,
+                    nextPipelineId: joinedPipelineId
+                });
 
-            const { parentBuilds } = parseJobInfo({
-                joinObj: joinedPipeline.jobs,
-                currentBuild,
-                currentPipeline,
-                currentJob,
-                nextJobName,
-                nextPipelineId: joinedPipelineId
-            });
+                let nextBuild;
 
-            let nextBuild;
+                try {
+                    if (resource) lock = await locker.lock(resource);
 
-            try {
-                if (resource) lock = await locker.lock(resource);
-
-                if (isOrTrigger(externalEvent.workflowGraph, remoteTriggerName, nextJobName)) {
-                    nextBuild = await remoteTrigger.execute(
-                        externalEvent,
-                        externalEvent.pipelineId,
-                        nextJobName,
-                        nextJobId,
-                        parentBuilds,
-                        isNextJobVirtual
-                    );
-                } else {
-                    // Re get join list when first time remote trigger since external event was empty and cannot get workflow graph then
-                    const joinList =
-                        nextJob.join.length > 0
-                            ? nextJob.join
-                            : workflowParser.getSrcForJoin(externalEvent.workflowGraph, { jobName: nextJobName });
-                    const joinListNames = joinList.map(j => j.name);
-
-                    nextBuild = await remoteJoin.execute(
-                        externalEvent,
-                        nextJobName,
-                        nextJobId,
-                        parentBuilds,
-                        groupEventBuilds,
-                        joinListNames,
-                        isNextJobVirtual,
-                        nextJobStageName
+                    if (isOrTrigger(externalEvent.workflowGraph, remoteTriggerName, nextJobName)) {
+                        nextBuild = await remoteTrigger.execute(
+                            externalEvent,
+                            externalEvent.pipelineId,
+                            nextJobName,
+                            nextJobId,
+                            parentBuilds,
+                            isNextJobVirtual
+                        );
+                    } else {
+                        // Re get join list when first time remote trigger since external event was empty and cannot get workflow graph then
+                        const joinList =
+                            nextJob.join.length > 0
+                                ? nextJob.join
+                                : workflowParser.getSrcForJoin(externalEvent.workflowGraph, { jobName: nextJobName });
+                        const joinListNames = joinList.map(j => j.name);
+
+                        nextBuild = await remoteJoin.execute(
+                            externalEvent,
+                            nextJobName,
+                            nextJobId,
+                            parentBuilds,
+                            groupEventBuilds,
+                            joinListNames,
+                            isNextJobVirtual,
+                            nextJobStageName
+                        );
+                    }
+
+                    if (isNextJobVirtual && nextBuild.status === Status.SUCCESS) {
+                        const nextJobModel = await nextBuild.job;
+
+                        downstreamOfNextJobsToBeProcessed.push({
+                            build: nextBuild,
+                            event: currentEvent,
+                            job: nextJobModel,
+                            pipeline: await nextJobModel.pipeline,
+                            scmContext: config.scmContext,
+                            username: config.username
+                        });
+                    }
+                } catch (err) {
+                    logger.error(
+                        `Error in triggerJobsInExternalPipeline:${joinedPipelineId} from pipeline:${currentPipeline.id}-${currentJob.name}-event:${currentEvent.id} `,
+                        err
                     );
                 }
 
-                if (isNextJobVirtual && nextBuild.status === Status.SUCCESS) {
-                    const nextJobModel = await nextBuild.job;
-
-                    downstreamOfNextJobsToBeProcessed.push({
-                        build: nextBuild,
-                        event: currentEvent,
-                        job: nextJobModel,
-                        pipeline: await nextJobModel.pipeline,
-                        scmContext: config.scmContext,
-                        username: config.username
-                    });
-                }
-            } catch (err) {
-                logger.error(
-                    `Error in triggerJobsInExternalPipeline:${joinedPipelineId} from pipeline:${currentPipeline.id}-${currentJob.name}-event:${currentEvent.id} `,
-                    err
-                );
+                await locker.unlock(lock, resource);
             }
-
-            await locker.unlock(lock, resource);
         }
     }
 

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,