feat(1415): Configure subscribed jobs to be triggered wrt to startFrom

screwdriver-cd · Aug 28, 2020 · 6b2f065 · 6b2f065
1 parent af52ca7
commit 6b2f065
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/plugins/webhooks/index.js b/plugins/webhooks/index.js
@@ -422,12 +422,6 @@ async function createPREvents(options, request) {
                 baseBranch: branch
             };
 
-            // Check is the webhook event is from a subscribed repo
-            if (uriTrimmer(scmConfig.scmUri) !== uriTrimmer(p.scmUri)) {
-                eventConfig.subscribedEvent = true;
-                eventConfig.subscribedScmConfig = scmConfig;
-            }
-
             if (skipMessage) {
                 eventConfig.skipMessage = skipMessage;
             }
@@ -436,6 +430,14 @@ async function createPREvents(options, request) {
                 eventConfig.startFrom = '~pr';
             }
 
+            // Check is the webhook event is from a subscribed repo and
+            // set the jobs entrypoint from ~startfrom
+            if (uriTrimmer(scmConfig.scmUri) !== uriTrimmer(p.scmUri)) {
+                eventConfig.subscribedEvent = true;
+                eventConfig.subscribedScmConfig = scmConfig;
+                eventConfig.startFrom = '~subscribe';
+            }
+
             return eventConfig;
         })
     );
@@ -852,10 +854,12 @@ async function createEvents(
                     ref
                 };
 
-                // Check is the webhook event is from a subscribed repo
+                // Check is the webhook event is from a subscribed repo and
+                // set the jobs entry point to ~subscribe
                 if (uriTrimmer(scmConfigFromHook.scmUri) !== uriTrimmer(pTuple.pipeline.scmUri)) {
                     eventConfig.subscribedEvent = true;
                     eventConfig.subscribedScmConfig = scmConfigFromHook;
+                    eventConfig.startFrom = '~subscribe';
                 }
 
                 if (skipMessage) {

diff --git a/test/plugins/webhooks.test.js b/test/plugins/webhooks.test.js
@@ -1371,7 +1371,7 @@ describe('webhooks plugin test', () => {
                         scmContext,
                         sha,
                         configPipelineSha: latestSha,
-                        startFrom: '~commit',
+                        startFrom: '~subscribe',
                         baseBranch: 'master',
                         causeMessage: `Merged by ${username}`,
                         changedFiles,
@@ -1894,7 +1894,7 @@ describe('webhooks plugin test', () => {
                             scmContext,
                             sha,
                             configPipelineSha: latestSha,
-                            startFrom: '~pr',
+                            startFrom: '~subscribe',
                             prNum: 2,
                             prTitle: 'Update the README with new information',
                             prRef,