Handle a_ and b_ in incremental version numbers (#20)

Co-authored-by: Tim Jacomb <[email protected]>
jenkins-infra · Dec 28, 2021 · 7813981 · 7813981
1 parent f9961b3
commit 7813981
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/lib/pipeline.js b/lib/pipeline.js
@@ -68,6 +68,8 @@ module.exports = {
    */
   getArchiveUrl: (build_url, hash) => {
     let shortHash = hash.substring(0, 12);
-    return build_url + 'artifact/**/*' + shortHash + '*/*' + shortHash + '*/*zip*/archive.zip';
+    // https://github.com/jenkinsci/incrementals-tools/pull/24
+    let versionPattern = shortHash.replace(/[ab]/g, '$&*');
+    return build_url + 'artifact/**/*' + versionPattern + '*/*' + versionPattern + '*/*zip*/archive.zip';
   }
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "incrementals-publisher",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "",
   "private": true,
   "main": "index.js",

diff --git a/test/pipeline-test.js b/test/pipeline-test.js
@@ -154,8 +154,7 @@ describe('The Pipeline helpers', () => {
     it('should generate an archive.zip URL', () => {
       let hash = 'acbd4';
       const url = pipeline.getArchiveUrl(build_url, hash);
-      assert.ok(url);
-      assert.ok(url.match('archive.zip$'));
+      assert.strictEqual(url, 'https://ci.jenkins.io/job/structs-plugin/job/PR-36/3/artifact/**/*a*cb*d4*/*a*cb*d4*/*zip*/archive.zip');
     });
   });