Publish Min Artifacts with new 7.3.4 libs (#5180)

peterzhuamazon · web-flow · commit d74cbaf9fd5f · 2024-11-11T19:08:56.000-05:00
Signed-off-by: Peter Zhu &lt;zhujiaxi@amazon.com&gt;
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@7.3.3', retriever: modernSCM([
+lib = library(identifier: 'jenkins@7.3.4', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))
@@ -74,7 +74,6 @@ pipeline {
                             )
                             echo("Uploading linux x64 tar min snapshots to S3")
                             uploadMinSnapshotsToS3(
-                                fileActions: [createSha512Checksums(), createSignatureFiles()],
                                 distribution: 'tar'
                             )
                         }
@@ -107,7 +106,6 @@ pipeline {
                             )
                             echo("Uploading linux arm64 tar min snapshots to S3")
                             uploadMinSnapshotsToS3(
-                                fileActions: [createSha512Checksums(), createSignatureFiles()],
                                 distribution: 'tar'
                             )
                         }
@@ -139,7 +137,6 @@ pipeline {
                             )
                             echo("Uploading darwin x64 tar min snapshots to S3")
                             uploadMinSnapshotsToS3(
-                                fileActions: [createSha512Checksums(), createSignatureFiles()],
                                 distribution: 'tar'
                             )
                         }
@@ -171,7 +168,6 @@ pipeline {
                             )
                             echo("Uploading darwin arm64 tar min snapshots to S3")
                             uploadMinSnapshotsToS3(
-                                fileActions: [createSha512Checksums(), createSignatureFiles()],
                                 distribution: 'tar'
                             )
                         }
@@ -206,7 +202,6 @@ pipeline {
                                 )
                                 echo("Uploading windows x64 zip min snapshots to S3")
                                 uploadMinSnapshotsToS3(
-                                    fileActions: [createSha512Checksums(), createSignatureFiles()],
                                     distribution: 'zip'
                                 )
                             }
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('7.3.3')
+                .defaultVersion('7.3.4')
                 .allowOverride(true)
                 .implicit(true)
                 .targetPath('vars')
@@ -95,22 +95,18 @@ class TestPublishMinSnapshots extends BuildPipelineTest {
             //linux-x64-tar
             '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz}',
             '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.sha512}',
-            '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.sig, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-x64-latest.tar.gz.sig}',
             '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-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-linux-x64-latest.tar.gz.build-manifest.yml}',
             //linux-arm64-tar
             '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz}',
             '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz.sha512}',
-            '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz.sig, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-latest.tar.gz.sig}',
             '{file=/tmp/workspace/tar/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-linux-arm64-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-linux-arm64-latest.tar.gz.build-manifest.yml}',
             // window-x64-upload
             '{file=/tmp/workspace/zip/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip}',
             '{file=/tmp/workspace/zip/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip.sha512}',
-            '{file=/tmp/workspace/zip/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip.sig, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip.sig}',
             '{file=/tmp/workspace/zip/builds/opensearch/dist/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip.build-manifest.yml, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-windows-x64-latest.zip.build-manifest.yml}',
             // 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.sig, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/3.0.0-SNAPSHOT/opensearch-min-3.0.0-SNAPSHOT-darwin-x64-latest.tar.gz.sig}',
             '{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*}'))
     }
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* compatible open source license.`
`8`	`8`	`*/`
`9`	`9`
`10`		`-lib = library(identifier: 'jenkins@7.3.3', retriever: modernSCM([`
	`10`	`+lib = library(identifier: 'jenkins@7.3.4', retriever: modernSCM([`
`11`	`11`	`$class: 'GitSCMSource',`
`12`	`12`	`remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',`
`13`	`13`	`]))`
`@@ -74,7 +74,6 @@ pipeline {`
`74`	`74`	`)`
`75`	`75`	`echo("Uploading linux x64 tar min snapshots to S3")`
`76`	`76`	`uploadMinSnapshotsToS3(`
`77`		`- fileActions: [createSha512Checksums(), createSignatureFiles()],`
`78`	`77`	`distribution: 'tar'`
`79`	`78`	`)`
`80`	`79`	`}`
`@@ -107,7 +106,6 @@ pipeline {`
`107`	`106`	`)`
`108`	`107`	`echo("Uploading linux arm64 tar min snapshots to S3")`
`109`	`108`	`uploadMinSnapshotsToS3(`
`110`		`- fileActions: [createSha512Checksums(), createSignatureFiles()],`
`111`	`109`	`distribution: 'tar'`
`112`	`110`	`)`
`113`	`111`	`}`
`@@ -139,7 +137,6 @@ pipeline {`
`139`	`137`	`)`
`140`	`138`	`echo("Uploading darwin x64 tar min snapshots to S3")`
`141`	`139`	`uploadMinSnapshotsToS3(`
`142`		`- fileActions: [createSha512Checksums(), createSignatureFiles()],`
`143`	`140`	`distribution: 'tar'`
`144`	`141`	`)`
`145`	`142`	`}`
`@@ -171,7 +168,6 @@ pipeline {`
`171`	`168`	`)`
`172`	`169`	`echo("Uploading darwin arm64 tar min snapshots to S3")`
`173`	`170`	`uploadMinSnapshotsToS3(`
`174`		`- fileActions: [createSha512Checksums(), createSignatureFiles()],`
`175`	`171`	`distribution: 'tar'`
`176`	`172`	`)`
`177`	`173`	`}`
`@@ -206,7 +202,6 @@ pipeline {`
`206`	`202`	`)`
`207`	`203`	`echo("Uploading windows x64 zip min snapshots to S3")`
`208`	`204`	`uploadMinSnapshotsToS3(`
`209`		`- fileActions: [createSha512Checksums(), createSignatureFiles()],`
`210`	`205`	`distribution: 'zip'`
`211`	`206`	`)`
`212`	`207`	`}`