Fix release sources zip jenkins job (apache#1248)

rodrigonull · Sep 17, 2024 · 3965397 · 3965397
1 parent 47c20ac
commit 3965397
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.zip.sources b/.ci/jenkins/Jenkinsfile.zip.sources
@@ -9,7 +9,8 @@ pipeline {
 
     environment {
         SOURCES_FILE_NAME = "${SOURCES_FILE_NAME_TEMPLATE}.zip"
-        SIGNATURE_FILE_NAME = "${SOURCES_FILE_NAME_TEMPLATE}.asc"
+        SIGNATURE_FILE_NAME = "${SOURCES_FILE_NAME_TEMPLATE}.zip.asc"
+        CHECKSUM_FILE_NAME = "${SOURCES_FILE_NAME_TEMPLATE}.zip.sha512"
     }
 
     options {
@@ -23,20 +24,21 @@ pipeline {
                 archiveArtifacts artifacts: "**/${SOURCES_FILE_NAME}"
             }
         }
-       stage('Sign and upload the sources.zip') {
-           steps {
-               script {
-                   releaseUtils.gpgImportKeyFromStringWithoutPassword(getReleaseGpgSignKeyCredsId())
-                   releaseUtils.gpgSignFileDetachedSignatureWithoutPassword(SOURCES_FILE_NAME, SIGNATURE_FILE_NAME)
-                   releaseUtils.svnUploadFileToRepository(getReleaseSvnRepository(), getReleaseSvnCredsId(), TARGET_VERSION, SOURCES_FILE_NAME, SIGNATURE_FILE_NAME)
-               }
-               archiveArtifacts artifacts: "**/${SIGNATURE_FILE_NAME}"
-           }
-       }
+        stage('Sign and upload the sources.zip') {
+            steps {
+                dir('sources-out') {
+                    script {
+                        releaseUtils.gpgImportKeyFromStringWithoutPassword(getReleaseGpgSignKeyCredsId())
+                        releaseUtils.gpgSignFileDetachedSignatureWithoutPassword(SOURCES_FILE_NAME, SIGNATURE_FILE_NAME)
+                        releaseUtils.svnUploadFileToRepository(getReleaseSvnRepository(), getReleaseSvnCredsId(), TARGET_VERSION, SOURCES_FILE_NAME, SIGNATURE_FILE_NAME, CHECKSUM_FILE_NAME)
+                    }
+                    archiveArtifacts artifacts: "**/${SIGNATURE_FILE_NAME}"
+                }
+            }
+        }
     }
 }
 
-
 String getReleaseGpgSignKeyCredsId() {
     return env.RELEASE_GPG_SIGN_KEY_CREDS_ID
 }

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
@@ -331,8 +331,8 @@ void setupZipSourcesJob() {
 
             RELEASE_GPG_SIGN_KEY_CREDS_ID: Utils.getReleaseGpgSignKeyCredentialsId(this),
             RELEASE_GPG_SIGN_PASSPHRASE_CREDS_ID: Utils.getReleaseGpgSignPassphraseCredentialsId(this),
-            RELEASE_SVN_REPOSITORY: Utils.getReleaseSvnCredentialsId(this),
-            RELEASE_SVN_CREDS_ID: Utils.getReleaseSvnStagingRepository(this)
+            RELEASE_SVN_REPOSITORY: Utils.getReleaseSvnStagingRepository(this),
+            RELEASE_SVN_CREDS_ID: Utils.getReleaseSvnCredentialsId(this)
             ])
 
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {