fix: Allow H range in cron expression for periodic builds (#43)

screwdriver-cd · Feb 20, 2019 · 19cecf0 · 19cecf0
1 parent f1d196f
commit 19cecf0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/cron.js b/lib/cron.js
@@ -78,9 +78,12 @@ const transformCron = (cronExp, jobId) => {
 
     const jobIdHash = stringHash(jobId.toString());
 
+    if (fields[0] !== 'H' && !fields[0].match(/H\(\d+-\d+\)/)) {
+        fields[0] = 'H';
+    }
+
     // Minutes [0-59]
-    // Always treat the minutes value as 'H'
-    fields[0] = transformValue('H', 0, 59, jobIdHash);
+    fields[0] = transformValue(fields[0], 0, 59, jobIdHash);
     // Hours [0-23]
     fields[1] = transformValue(fields[1], 0, 23, jobIdHash);
     // Day of month [1-31]

diff --git a/test/lib/cron.js b/test/lib/cron.js
@@ -43,6 +43,11 @@ describe('cron', () => {
         cronExp = '* H(0-5) * * *';
         assert.deepEqual(cron.transform(cronExp, jobId),
             `${minutesHash} ${evaluateHash(jobId, 0, 5)} * * *`);
+
+        // H(0-5) * * * *
+        cronExp = 'H(0-5) * * * *';
+        assert.deepEqual(cron.transform(cronExp, jobId),
+            `${evaluateHash(jobId, 0, 5)} * * * *`);
     });
 
     it('should throw if the cron expression has an invalid range value', () => {