Syntax error in GPG_KEY variable

internet2 · Feb 16, 2022 · c12df30 · c12df30
1 parent 3f59ce5
commit c12df30
Showing 1 changed file with 22 additions and 30 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,11 +11,10 @@ def tag_pattern = /^(\d+\.\d+\.\w+)$/
 def grouper_src_branch = "GROUPER_RELEASE_${git_tag}"
 
 node('docker') {
-
 
     if (git_tag ==~ tag_pattern ) {
         environment {
-            JAVA_HOME='/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64'
+            JAVA_HOME=java_home
         }
         stage("PgpImport") {
             withCredentials([file(credentialsId: gpg_cred_id, variable: 'GPG_KEYS')]) {
@@ -43,50 +42,43 @@ node('docker') {
             def grouper_version = (git_tag =~ tag_pattern)[0][1]
 
             println "Extracted grouper version '${grouper_version}' from input '${git_tag}'"
-            withEnv(["JAVA_HOME=${java_home}"]) {
-                sh "echo JAVA_HOME=$JAVA_HOME"
-                withMaven(
-                    maven: maven_id,
-                    mavenSettingsFilePath: "travis/mvn.settings.xml",
-                    jdk: jdk_id
-                    ) {
-                        sh "JAVA_HOME=/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64 mvn -f grouper-parent versions:set -DnewVersion=${grouper_version}"
-                }
+            sh "echo JAVA_HOME=$JAVA_HOME"
+            withMaven(
+                maven: maven_id,
+                mavenSettingsFilePath: "travis/mvn.settings.xml",
+                jdk: jdk_id
+                ) {
+                    sh "JAVA_HOME=${java_home} mvn -f grouper-parent versions:set -DnewVersion=${grouper_version}"
             }
         }
 
         stage('Build') {
-            withEnv(["JAVA_HOME=${java_home}"]) {
-                sh "echo JAVA_HOME=$JAVA_HOME"
-                withMaven(
-                    maven: maven_id,
-                    mavenSettingsFilePath: "travis/mvn.settings.xml",
-                    mavenOpts: '-Xmx2048m',
-                    jdk: jdk_id
-                    ) {
-                        sh "JAVA_HOME=/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64 mvn -f grouper-parent clean compile package"
-                }
+            sh "echo JAVA_HOME=$JAVA_HOME"
+            withMaven(
+                maven: maven_id,
+                mavenSettingsFilePath: "travis/mvn.settings.xml",
+                mavenOpts: '-Xmx2048m',
+                jdk: jdk_id
+                ) {
+                    sh "JAVA_HOME=${java_home} mvn -f grouper-parent clean compile package"
             }
         }
 
         stage('Release') {
             withCredentials([usernamePassword(credentialsId: sonatype_cred_id, usernameVariable: 'SONATYPE_USER', passwordVariable: 'SONATYPE_PWD')]) {
-                withEnv(["JAVA_HOME=${java_home}"]) {
                 sh "echo JAVA_HOME=$JAVA_HOME"
                 withMaven(
-                        maven: maven_id,
-                        mavenSettingsFilePath: "travis/mvn.settings.xml",
-                        mavenOpts: '-Xmx2048m',
-                        jdk: jdk_id
-                        ) {
-                            sh "JAVA_HOME=/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64 mvn -f grouper-parent deploy -Prelease -Dgpg.keyname=$GPG_KEY"
+                    maven: maven_id,
+                    mavenSettingsFilePath: "travis/mvn.settings.xml",
+                    mavenOpts: '-Xmx2048m',
+                    jdk: jdk_id
+                    ) {
+                        sh "JAVA_HOME=${java_home} mvn -f grouper-parent deploy -Prelease -Dgpg.keyname='${gpg_key}'"
                     }
-                }
             }
         }
     } else {
         currentBuild.result = 'ABORTED'
         error "Aborting build since tag doesn't match pattern '${tag_pattern}'"
     }
 }
-