This is an automated email from the ASF dual-hosted git repository.

rantunes pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git


The following commit(s) were added to refs/heads/main by this push:
     new 8526948736 kie-issues#1387: Adjust pipelines to use the gpg key 
provided by Apache to sign the artifacts (#6026)
8526948736 is described below

commit 852694873684b15dcf0b196f514ba4ee7e63a67e
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Tue Jul 16 11:17:16 2024 -0300

    kie-issues#1387: Adjust pipelines to use the gpg key provided by Apache to 
sign the artifacts (#6026)
    
    * Adjust pipelines to use the gpg key provided by Apache to sign the 
artifacts
    
    * Update builder image
---
 .ci/jenkins/Jenkinsfile.deploy | 10 +++-------
 .ci/jenkins/config/branch.yaml |  4 ++--
 .ci/jenkins/config/main.yaml   |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 20b20701bb..22bfc61114 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -134,13 +134,9 @@ pipeline {
                         }
 
                         if (isRelease()) {
-                            
release.gpgImportKeyFromFileWithPassword(getReleaseGpgSignKeyCredsId(), 
getReleaseGpgSignPassphraseCredsId())
-                            withCredentials([string(credentialsId: 
getReleaseGpgSignPassphraseCredsId(), variable: 'SIGNING_KEY_PASSWORD')]) {
-                                    
mavenCommand.withProperty('gpg.passphrase', SIGNING_KEY_PASSWORD)
-                                        .withProfiles(['apache-release'])
-                                    // If there are passwords, this needs to 
be duplicated within the withCredentials block.
-                                    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 439eea1b2d..59f7b1bac5 100644
--- a/.ci/jenkins/config/branch.yaml
+++ b/.ci/jenkins/config/branch.yaml
@@ -98,8 +98,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: DROOLS_CI_NOTIFICATION_EMAILS
   agent:
diff --git a/.ci/jenkins/config/main.yaml b/.ci/jenkins/config/main.yaml
index cfef740afe..c439e0ab84 100644
--- a/.ci/jenkins/config/main.yaml
+++ b/.ci/jenkins/config/main.yaml
@@ -53,5 +53,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


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to