Upload core plugins snapshots / gradle check updates in lib 7.3.2 (#5165

) Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Nov 6, 2024 · 2bcd21b · 2bcd21b
1 parent 6149528
commit 2bcd21b
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 20 deletions.
diff --git a/jenkins/gradle/gradle-check.jenkinsfile b/jenkins/gradle/gradle-check.jenkinsfile
@@ -7,7 +7,7 @@
  * compatible open source license.
  */
 
-lib = library(identifier: 'jenkins@7.2.0', retriever: modernSCM([
+lib = library(identifier: 'jenkins@7.3.2', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))

diff --git a/jenkins/opensearch/publish-min-snapshots.jenkinsfile b/jenkins/opensearch/publish-min-snapshots.jenkinsfile
@@ -7,7 +7,7 @@
  * compatible open source license.
  */
 
-lib = library(identifier: 'jenkins@6.6.1', retriever: modernSCM([
+lib = library(identifier: 'jenkins@7.3.2', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))

diff --git a/tests/jenkins/TestPublishMinSnapshots.groovy b/tests/jenkins/TestPublishMinSnapshots.groovy
@@ -25,7 +25,7 @@ class TestPublishMinSnapshots extends BuildPipelineTest {
 
         helper.registerSharedLibrary(
             library().name('jenkins')
-                .defaultVersion('6.6.1')
+                .defaultVersion('7.3.2')
                 .allowOverride(true)
                 .implicit(true)
                 .targetPath('vars')
@@ -57,6 +57,7 @@ class TestPublishMinSnapshots extends BuildPipelineTest {
             return helper.callClosure(closure)
         })
         helper.registerAllowedMethod('s3Upload', [Map], {})
+        helper.registerAllowedMethod('fileExists', [String], { true })
     }
 
     @Test
@@ -105,6 +106,7 @@ class TestPublishMinSnapshots extends BuildPipelineTest {
             // macos-x64-upload
             '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz}',
             '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.sha512}', '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.build-manifest.yml, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.build-manifest.yml}'))
+        assertThat(getCommands('s3Upload', 'plugins'), hasItems('{bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/plugins/ingest-attachment-3.0.0-SNAPSHOT.zip/3.0.0-SNAPSHOT-SNAPSHOT/, workingDir=/tmp/workspace/tar/builds/opensearch/core-plugins/, includePathPattern=**/ingest-attachment-3.0.0-SNAPSHOT.zip*}'))
     }
 
     def getCommands(String methodName, String commandString) {