NO-ISSUE: Switch to GPG File Jenkins secret (apache#1240)

* Switch to GPG File Jenkins secret * Switch to GPG File Jenkins secret
rodrigonull · Aug 30, 2024 · e30d4f6 · e30d4f6
1 parent 37cafc7
commit e30d4f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml
@@ -90,7 +90,7 @@ cloud:
 release:
   gpg:
     sign:
-      key_credentials_id: GPG_KEY
+      key_credentials_id: GPG_KEY_FILE
       passphrase_credentials_id: ''
   svn:
     staging_repository: https://dist.apache.org/repos/dist/dev/incubator/kie

diff --git a/jenkins-pipeline-shared-libraries/vars/releaseUtils.groovy b/jenkins-pipeline-shared-libraries/vars/releaseUtils.groovy
@@ -14,14 +14,10 @@ def gpgImportKeyFromFileWithPassword(String gpgKeyCredentialsId, String gpgKeyPa
 }
 
 def gpgImportKeyFromStringWithoutPassword(String gpgKeyCredentialsId) {
-    withCredentials([string(credentialsId: gpgKeyCredentialsId, variable: 'SIGNING_KEY')]) {
-        // copy the key to singkey.gpg file in *plain text* so we can import it
+    withCredentials([file(credentialsId: gpgKeyCredentialsId, variable: 'SIGNING_KEY')]) {
         sh """
-            echo "$SIGNING_KEY" > $WORKSPACE/signkey.gpg
-            # Please do not remove list keys command. When gpg is run for the first time, it may initialize some internals.
             gpg --list-keys
-            gpg --batch --pinentry-mode=loopback --import $WORKSPACE/signkey.gpg
-            rm $WORKSPACE/signkey.gpg
+            gpg --batch --pinentry-mode=loopback --import $SIGNING_KEY
         """
     }
 }