feat(3066): relax the stage trigger to allow join (#566)

screwdriver-cd · May 31, 2024 · cc3244b · cc3244b
1 parent 8611862
commit cc3244b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/config/regex.js b/config/regex.js
@@ -51,8 +51,8 @@ module.exports = {
     INTERNAL_TRIGGER: /^~([\w-]+)$/,
     // Stages can only be named with A-Z,a-z,0-9,-,_
     STAGE_NAME: /^[\w-]+$/,
-    // Stage trigger like ~stage@deploy or ~stage@stageName:jobName
-    STAGE_TRIGGER: /^~stage@([\w-]+)(?::([\w-]+))?$/,
+    // Stage trigger like ~stage@deploy or ~stage@stageName:jobName or stage@deploy or stage@stageName:jobName
+    STAGE_TRIGGER: /^~?stage@([\w-]+)(?::([\w-]+))?$/,
     // Don't combine EXTERNAL_TRIGGER and EXTERNAL_TRIGGER_AND for backward compatibility
     // BlockBy does not support EXTERNAL_TRIGGER_AND
     // External trigger like ~sd@123:component (OR case)

diff --git a/test/config/regex.test.js b/test/config/regex.test.js
@@ -461,4 +461,21 @@ describe('config regex', () => {
             assert.isFalse(config.regex.SCM_URI.test('bitbucket.org:{123}'));
         });
     });
+
+    describe('stageTrigger', () => {
+        const stageTriggerRegex = config.regex.STAGE_TRIGGER;
+
+        it('matches valid stage triggers', () => {
+            assert.isTrue(stageTriggerRegex.test('stage@build'));
+            assert.isTrue(stageTriggerRegex.test('stage@build:setup'));
+            assert.isTrue(stageTriggerRegex.test('~stage@test'));
+            assert.isTrue(stageTriggerRegex.test('~stage@test:tearDown'));
+        });
+
+        it('does not match invalid stage triggers', () => {
+            assert.isFalse(stageTriggerRegex.test('stage:'));
+            assert.isFalse(stageTriggerRegex.test('stage:build:test'));
+            assert.isFalse(stageTriggerRegex.test('build'));
+        });
+    });
 });