Only sign core plugins and ignore min artifacts (#564)

Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Nov 11, 2024 · e6ec7d1 · e6ec7d1
1 parent 0196bcb
commit e6ec7d1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -128,7 +128,7 @@ jacocoTestReport {
     }
 }
 
-String version = '7.3.3'
+String version = '7.3.4'
 
 task updateVersion {
     doLast {

diff --git a/tests/jenkins/jobs/uploadMinSnapshotsToS3_Jenkinsfile.txt b/tests/jenkins/jobs/uploadMinSnapshotsToS3_Jenkinsfile.txt
@@ -19,6 +19,7 @@
                   uploadMinSnapshotsToS3.withCredentials([ARTIFACT_PROMOTION_ROLE_NAME, AWS_ACCOUNT_ARTIFACT, ARTIFACT_PRODUCTION_BUCKET_NAME], groovy.lang.Closure)
                      uploadMinSnapshotsToS3.fileExists(tests/data/tar/builds/opensearch/core-plugins)
                      uploadMinSnapshotsToS3.echo(Create .sha512 for Min Snapshots Artifacts)
+                     uploadMinSnapshotsToS3.createSha512Checksums()
                      createSha512Checksums.sh({script=find tests/data/tar/builds/opensearch/dist -type f, returnStdout=true})
                      createSha512Checksums.echo(Creating sha for opensearch-min-1.3.0-linux-x64.tar.gz)
                      createSha512Checksums.sh({script=sha512sum opensearch-min-1.3.0-linux-x64.tar.gz, returnStdout=true})
@@ -38,13 +39,11 @@ ccc
                      uploadMinSnapshotsToS3.sh(
                 cp -v tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64.tar.gz tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64-latest.tar.gz
                 cp -v tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64.tar.gz.sha512 tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64-latest.tar.gz.sha512
-                cp -v tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64.tar.gz.sig tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64-latest.tar.gz.sig
                 cp -v tests/data/tar/builds/opensearch/dist/../manifest.yml tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64-latest.tar.gz.build-manifest.yml
                 sed -i "s/.tar.gz/-latest.tar.gz/g" tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64-latest.tar.gz.sha512
             )
                      uploadMinSnapshotsToS3.withAWS({role=ARTIFACT_PROMOTION_ROLE_NAME, roleAccount=AWS_ACCOUNT_ARTIFACT, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure)
                         uploadMinSnapshotsToS3.echo(Upload min snapshots)
                         uploadMinSnapshotsToS3.s3Upload({file=tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64-latest.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/1.3.0/opensearch-min-1.3.0-linux-x64-latest.tar.gz})
                         uploadMinSnapshotsToS3.s3Upload({file=tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64-latest.tar.gz.sha512, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/1.3.0/opensearch-min-1.3.0-linux-x64-latest.tar.gz.sha512})
-                        uploadMinSnapshotsToS3.s3Upload({file=tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64-latest.tar.gz.sig, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/1.3.0/opensearch-min-1.3.0-linux-x64-latest.tar.gz.sig})
                         uploadMinSnapshotsToS3.s3Upload({file=tests/data/tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64-latest.tar.gz.build-manifest.yml, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=snapshots/core/opensearch/1.3.0/opensearch-min-1.3.0-linux-x64-latest.tar.gz.build-manifest.yml})
diff --git a/vars/uploadMinSnapshotsToS3.groovy b/vars/uploadMinSnapshotsToS3.groovy
@@ -45,8 +45,6 @@ void call(Map args = [:]) {
     String srcDir = "${WORKSPACE}/${distribution}/builds/${productName}/dist".replace("\\", "/")
     String dstDir = "snapshots/core/${productName}/${version}"
     String baseName = "${productName}-min-${version}-${platform}-${architecture}"
-    argsMap = [:]
-    argsMap['sigtype'] = '.sig'
 
     withCredentials([
         string(credentialsId: 'jenkins-artifact-promotion-role', variable: 'ARTIFACT_PROMOTION_ROLE_NAME'),
@@ -57,18 +55,23 @@ void call(Map args = [:]) {
             String corePluginDir = "${WORKSPACE}/${distribution}/builds/${productName}/core-plugins".replace("\\", "/")
             boolean corePluginDirExists = fileExists(corePluginDir)
             if (architecture == "x64" && platform == "linux" && distribution == "tar" && corePluginDirExists) {
-                echo("Create .sha512 for Core Plugins Snapshots")
-                argsMap['artifactPath'] = corePluginDir
+                echo("Create .sha512 and .sig for Core Plugins Snapshots")
+                fileActions = [createSha512Checksums(), createSignatureFiles()]
+                argsMapPlugins = [:]
+                argsMapPlugins['sigtype'] = '.sig'
+                argsMapPlugins['artifactPath'] = "${WORKSPACE}/${distribution}/builds/${productName}/core-plugins"
                 for (Closure action : fileActions) {
-                    action(argsMap)
+                    action(argsMapPlugins)
                 }
             }
 
-            // Setup min snapshots with .sha512 and .sig (All distributions)
+            // Setup min snapshots with .sha512 (All distributions)
             echo('Create .sha512 for Min Snapshots Artifacts')
-            argsMap['artifactPath'] = srcDir
+            fileActions = [createSha512Checksums()]
+            argsMapMin = [:]
+            argsMapMin['artifactPath'] = srcDir
             for (Closure action : fileActions) {
-                action(argsMap)
+                action(argsMapMin)
             }
 
             echo("Start copying files: version-${version} revision-${revision} architecture-${architecture} platform-${platform} buildid-${id} distribution-${distribution} extension-${extension}")
@@ -81,7 +84,6 @@ void call(Map args = [:]) {
             sh """
                 cp -v ${srcDir}/${baseName}.${extension} ${srcDir}/${baseName}-latest.${extension}
                 cp -v ${srcDir}/${baseName}.${extension}.sha512 ${srcDir}/${baseName}-latest.${extension}.sha512
-                cp -v ${srcDir}/${baseName}.${extension}.sig ${srcDir}/${baseName}-latest.${extension}.sig
                 cp -v ${srcDir}/../manifest.yml ${srcDir}/${baseName}-latest.${extension}.build-manifest.yml
                 ${sedCmd} -i "s/.${extension}/-latest.${extension}/g" ${srcDir}/${baseName}-latest.${extension}.sha512
             """
@@ -90,7 +92,6 @@ void call(Map args = [:]) {
                 echo("Upload min snapshots")
                 s3Upload(file: "${srcDir}/${baseName}-latest.${extension}", bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}", path: "${dstDir}/${baseName}-latest.${extension}")
                 s3Upload(file: "${srcDir}/${baseName}-latest.${extension}.sha512", bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}", path: "${dstDir}/${baseName}-latest.${extension}.sha512")
-                s3Upload(file: "${srcDir}/${baseName}-latest.${extension}.sig", bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}", path: "${dstDir}/${baseName}-latest.${extension}.sig")
                 s3Upload(file: "${srcDir}/${baseName}-latest.${extension}.build-manifest.yml", bucket: "${ARTIFACT_PRODUCTION_BUCKET_NAME}", path: "${dstDir}/${baseName}-latest.${extension}.build-manifest.yml")
                 // core plugins
                 if (architecture == "x64" && platform == "linux" && distribution == "tar" && corePluginDirExists) {