From 92b27be07f86521de7ebca0379f3d500d2bf8d70 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 2 Apr 2021 12:26:55 -0700 Subject: [PATCH] Wrap deploy artifacts & deploy docs in a 'withEnv' directive to set the JAVA_HOME env var on the host machine (Jenkins node) before Gradle is run. --- Jenkinsfile | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 040d3c19..92d768d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,11 +67,13 @@ pipeline { withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) { withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) { withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) { - try { - sh 'GRADLE_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./gradlew deployArtifacts finalizeDeployArtifacts --no-daemon --refresh-dependencies --stacktrace -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD' - } - catch (e) { - currentBuild.result = "FAILED: deploy artifacts" + withEnv(["JAVA_HOME=${tool 'jdk8'}"]) { + try { + sh 'GRADLE_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./gradlew deployArtifacts finalizeDeployArtifacts --no-daemon --refresh-dependencies --stacktrace -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD' + } + catch (e) { + currentBuild.result = "FAILED: deploy artifacts" + } } } } @@ -84,11 +86,13 @@ pipeline { steps { script { withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { - try { - sh 'GRADLE_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./gradlew --no-daemon --refresh-dependencies --stacktrace -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME deployDocs' - } - catch (e) { - currentBuild.result = "FAILED: deploy docs" + withEnv(["JAVA_HOME=${tool 'jdk8'}"]) { + try { + sh 'GRADLE_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./gradlew --no-daemon --refresh-dependencies --stacktrace -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME deployDocs' + } + catch (e) { + currentBuild.result = "FAILED: deploy docs" + } } } }