From c12df30a8a060a38e7bfc6457feca7ba1c4d89dc Mon Sep 17 00:00:00 2001
From: Chad Redman <chad_redman@unc.edu>
Date: Wed, 16 Feb 2022 15:06:26 -0500
Subject: [PATCH] Syntax error in GPG_KEY variable
---
Jenkinsfile | 52 ++++++++++++++++++++++------------------------------
1 file changed, 22 insertions(+), 30 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7bf4328..8fb9fc5 100644
--- 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,45 +42,39 @@ 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 {
@@ -89,4 +82,3 @@ node('docker') {
error "Aborting build since tag doesn't match pattern '${tag_pattern}'"
}
}
-