From cbd03fd68817c893f21bb55cff4fefccbc747fc8 Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Tue, 16 Jul 2024 09:17:45 -0300
Subject: [PATCH] Adjust pipelines to use the gpg key provided by Apache to
 sign the artifacts

---
 .ci/jenkins/Jenkinsfile.deploy | 11 +++--------
 .ci/jenkins/config/branch.yaml |  4 ++--
 .ci/jenkins/config/main.yaml   |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index ce1bf0af095..4e30c0c3d5c 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -150,14 +150,9 @@ pipeline {
                             }
                         }
                         if (isRelease()) {
-                            release.gpgImportKeyFromFileWithPassword(getReleaseGpgSignKeyCredsId(), getReleaseGpgSignPassphraseCredsId())
-                            withCredentials([string(credentialsId: getReleaseGpgSignPassphraseCredsId(), variable: 'SIGNING_KEY_PASSWORD')]) {
-                                    mavenCommand.withProperty('gpg.passphrase', SIGNING_KEY_PASSWORD)
-                                    mavenCommand.withProfiles(['apache-release'])
-
-                                    mavenRunClosure()
-                                }
-                            }
+                            release.gpgImportKeyFromStringWithoutPassword(getReleaseGpgSignKeyCredsId())
+                            mavenCommand.withProfiles(['apache-release'])
+                            mavenRunClosure()
                         } else {
                             mavenRunClosure()
                         }
diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml
index 77a2a539b37..7c9031d9491 100644
--- a/.ci/jenkins/config/branch.yaml
+++ b/.ci/jenkins/config/branch.yaml
@@ -87,8 +87,8 @@ cloud:
 release:
   gpg:
     sign:
-      key-credentials-id: 'asf-release-gpg-signing-key'
-      passphrase-credentials-id: 'asf-release-gpg-signing-key-passphrase'
+      key-credentials-id: 'GPG_KEY'
+      passphrase-credentials-id: ''
 jenkins:
   email_creds_id: OPTAPLANNER_CI_NOTIFICATION_EMAILS
   agent:
diff --git a/.ci/jenkins/config/main.yaml b/.ci/jenkins/config/main.yaml
index 72b57d5ebf4..214cc3cf874 100644
--- a/.ci/jenkins/config/main.yaml
+++ b/.ci/jenkins/config/main.yaml
@@ -48,5 +48,5 @@ jenkins:
         # At some point, this image will need to be changed when a release branch is created
         # but we need to make sure the image exists first ... simple tag before setting up the branch ?
         # See https://github.com/kiegroup/kie-issues/issues/551
-        image: quay.io/kiegroup/kogito-ci-build:main-latest
+        image: docker.io/apache/incubator-kie-kogito-ci-build:main-latest
         args: --privileged --group-add docker