screwdriver-api 8.0.45 → 8.0.47

package/package.json

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

package/plugins/builds/helper/updateBuild.js

@@ -344,14 +344,6 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
         }
 
         stageBuildHasFailure = TERMINAL_STATUSES.includes(stageBuild.status);
-
-        // Create a stage teardown build
-        if (!isStageTeardown) {
-            await createOrUpdateStageTeardownBuild(
-                { pipeline, job, build, username, scmContext, event, stage },
-                server.app
-            );
-        }
     }
 
     // Guard against triggering non-successful or unstable builds
@@ -371,19 +363,25 @@ async function updateBuildAndTriggerDownstreamJobs(config, build, server, userna
     // Determine if stage teardown build should start
     // (if stage teardown build exists, and stageBuild.status is negative,
     // and there are no active stage builds, and teardown build is not started)
-    if (stage && FINISHED_STATUSES.includes(newBuild.status)) {
+    if (stage && FINISHED_STATUSES.includes(newBuild.status) && !isStageTeardown) {
         const stageTeardownName = getFullStageJobName({ stageName: stage.name, jobName: 'teardown' });
         const stageTeardownJob = await jobFactory.get({ pipelineId: pipeline.id, name: stageTeardownName });
-        const stageTeardownBuild = await buildFactory.get({ eventId: newEvent.id, jobId: stageTeardownJob.id });
+        let stageTeardownBuild = await buildFactory.get({ eventId: newEvent.id, jobId: stageTeardownJob.id });
 
         // Start stage teardown build if stage is done
-        if (stageTeardownBuild && stageTeardownBuild.status === 'CREATED') {
+        if (!stageTeardownBuild || stageTeardownBuild.status === 'CREATED') {
             const stageJobBuilds = await getStageJobBuilds({ stage, event: newEvent, jobFactory });
             const stageIsDone = isStageDone(stageJobBuilds);
 
             if (stageIsDone) {
                 const teardownNode = newEvent.workflowGraph.nodes.find(n => n.id === stageTeardownJob.id);
 
+                // Update teardown build
+                stageTeardownBuild = await createOrUpdateStageTeardownBuild(
+                    { pipeline, job, build, username, scmContext, event, stage },
+                    server.app
+                );
+
                 stageTeardownBuild.parentBuildId = stageJobBuilds.map(b => b.id);
 
                 if (teardownNode && teardownNode.virtual) {

package/plugins/builds/triggers/helpers.js

@@ -1003,7 +1003,7 @@ async function ensureStageTeardownBuildExists({
 
     // Doesn't exist, create stage teardown job
     if (!existingStageTeardownBuild) {
-        await createInternalBuild({
+        return createInternalBuild({
             jobFactory,
             buildFactory,
             pipelineId: current.pipeline.id,
@@ -1016,13 +1016,13 @@ async function ensureStageTeardownBuildExists({
             baseBranch: current.event.baseBranch || null,
             start: false
         });
-    } else {
-        await updateParentBuilds({
-            joinParentBuilds: parentBuilds,
-            nextBuild: existingStageTeardownBuild,
-            build: current.build
-        });
     }
+
+    return updateParentBuilds({
+        joinParentBuilds: parentBuilds,
+        nextBuild: existingStageTeardownBuild,
+        build: current.build
+    });
 }
 
 /**

package/plugins/webhooks/helper.js

@@ -47,7 +47,11 @@ function determineStartFrom(action, type, targetBranch, pipelineBranch, releaseN
     let startFrom;
 
     if (type && type === 'pr') {
-        startFrom = '~pr';
+        if (action && action === 'closed') {
+            startFrom = '~pr-closed';
+        } else {
+            startFrom = '~pr';
+        }
     } else {
         switch (action) {
             case 'release':
@@ -890,7 +894,9 @@ async function pullRequestClosed(options, request, h) {
                     j.permutations.length > 0 &&
                     j.permutations[0] &&
                     j.permutations[0].requires &&
-                    j.permutations[0].requires.includes('~pr-closed')
+                    j.permutations[0].requires.some(
+                        require => require === '~pr-closed' || require.startsWith('~pr-closed:')
+                    )
             );
 
             prClosedJobs.push(...filteredJobs);