commit f2b323d64989504f815e2b6b57fcf2e0acc98f88
author Ed Merks <ed.merks@gmail.com> Sun Jan 22 15:23:27 2023 +0100
committer Ed Merks <ed.merks@gmail.com> Sun Jan 22 15:23:27 2023 +0100
tree 582d33c7707a9914f496af1867a2a508b62d6fcf
parent be3034792e15f729c19e2cb420f79fee8417d8d1

[581397] Provide support for extracting, merging, and updating Maven
dependencies in *.target files

Fix SimRelMaven.jenkinsfile

https://bugs.eclipse.org/bugs/show_bug.cgi?id=581397

maven/SimRelMaven.jenkinsfile

diff --git a/maven/SimRelMaven.jenkinsfile b/maven/SimRelMaven.jenkinsfile
index 933058c..3fec2e7 100644
--- a/maven/SimRelMaven.jenkinsfile
+++ b/maven/SimRelMaven.jenkinsfile
@@ -9,7 +9,7 @@
 
   tools {
     maven 'apache-maven-latest'
-    jdk 'openjdk-jdk11-latest'
+    jdk 'openjdk-jdk17-latest'
   }
 
   environment {
@@ -69,16 +69,38 @@
       }
     }
 
+    stage('Initialize PGP') {
+      steps {
+        withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) {
+         sh '''
+           gpg --batch --import "${KEYRING}"
+           for fpr in $(gpg --list-keys --with-colons  | awk -F: \'/fpr:/ {print $10}\' | sort -u); do echo -e "5\ny\n" |  gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust; done
+           '''
+        }
+      }
+    }
+
     stage('Build SimRel Maven') {
       steps {
         sshagent(['projects-storage.eclipse.org-bot-ssh']) {
           dir('maven') {
-            sh '''
-              if [[ $PROMOTE == false ]]; then
-                promotion_argument='-Dorg.eclipse.justj.p2.manager.args='
-              fi
-              mvn  --no-transfer-progress $promotion_argument -DPACK_AND_SIGN=true -Dorg.eclipse.justj.p2.manager.build.url=$JOB_URL -Dorg.eclipse.justj.p2.manager.relative=$PUBLISH_LOCATION -Dbuild.type=$BUILD_TYPE -Dgit.commit=$GIT_COMMIT -Dbuild.id=$BUILD_NUMBER clean verify
-              '''
+            withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) {
+              sh '''
+                if [[ $PROMOTE == false ]]; then
+                  promotion_argument='-Dorg.eclipse.justj.p2.manager.args='
+                fi
+                mvn \
+                  --no-transfer-progress \
+                  $promotion_argument \
+                  -Pgpg-sign \
+                  -Dgpg.passphrase="${KEYRING_PASSPHRASE}" \
+                  -Dorg.eclipse.justj.p2.manager.build.url=$JOB_URL \
+                  -Dorg.eclipse.justj.p2.manager.relative=$PUBLISH_LOCATION \
+                  -Dbuild.type=$BUILD_TYPE \
+                  clean \
+                  verify
+                '''
+            }
           }
         }
       }