From 56ca80ff73cab34106f22b2b50d546573d2179dd Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Wed, 7 Apr 2021 19:55:18 -0700
Subject: [PATCH] Polish.

---
 Jenkinsfile            |  8 ++++----
 ci/check.sh            |  2 +-
 ci/cleanupArtifacts.sh |  1 -
 ci/deployArtifacts.sh  | 12 ++++++++++--
 ci/deployDocs.sh       |  7 +++++--
 ci/setup.sh            |  5 ++++-
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8dfa5175..1fd98f73 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,14 +31,14 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /usr/bin/docker:/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home') {
+						docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /usr/bin/docker:/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock') {
 
 							sh "echo 'Setup build environment...'"
 							sh "ci/setup.sh"
 
 							// Cleanup any prior build system resources
 							try {
-								sh "echo 'Clean up build artifacts & GemFire/Geode files...'"
+								sh "echo 'Clean up GemFire/Geode files & build artifacts...'"
 								sh "ci/cleanupGemFiles.sh"
 								sh "ci/cleanupArtifacts.sh"
 							}
@@ -68,7 +68,7 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
+								docker.image('adoptopenjdk/openjdk8:latest') {
 									withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) {
 										withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) {
 											withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) {
@@ -93,7 +93,7 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
+								docker.image('adoptopenjdk/openjdk8:latest') {
 									withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
 										try {
 											sh "ci/deployDocs.sh"
diff --git a/ci/check.sh b/ci/check.sh
index 1e04b0d9..0cb75836 100755
--- a/ci/check.sh
+++ b/ci/check.sh
@@ -2,5 +2,5 @@
 
 set -eou pipefail
 
-GRADLE_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Djava.io.tmpdir=/tmp" \
+GRADLE_OPTS="-Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode-build-cache" \
  ./gradlew clean check --no-daemon --refresh-dependencies --stacktrace
diff --git a/ci/cleanupArtifacts.sh b/ci/cleanupArtifacts.sh
index 9d5ea6fb..1a72b54e 100755
--- a/ci/cleanupArtifacts.sh
+++ b/ci/cleanupArtifacts.sh
@@ -3,4 +3,3 @@
 #rm -Rf ./.gradle
 rm -Rf ./.m2
 exit 0
-
diff --git a/ci/deployArtifacts.sh b/ci/deployArtifacts.sh
index 87651d48..bc1b54da 100755
--- a/ci/deployArtifacts.sh
+++ b/ci/deployArtifacts.sh
@@ -2,5 +2,13 @@
 
 set -eou pipefail
 
-GRADLE_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
-  ./gradlew deployArtifacts finalizeDeployArtifacts --no-build-cache- --no-configuration-cache --no-daemon --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
+echo "Logged in as user [$USER] with home directory [$HOME] in the current working directory [$PWD]"
+
+./gradlew deployArtifacts finalizeDeployArtifacts --no-build-cache- --no-configuration-cache --no-daemon --stacktrace \
+ -PartifactoryUsername=$ARTIFACTORY_USERNAME \
+ -PartifactoryPassword=$ARTIFACTORY_PASSWORD \
+ -PossrhUsername=$OSSRH_USERNAME \
+ -PossrhPassword=$OSSRH_PASSWORD \
+ -Psigning.keyId=$SPRING_SIGNING_KEYID \
+ -Psigning.password=$SIGNING_PASSWORD \
+ -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE
diff --git a/ci/deployDocs.sh b/ci/deployDocs.sh
index 9cb4f574..9c75c734 100755
--- a/ci/deployDocs.sh
+++ b/ci/deployDocs.sh
@@ -2,5 +2,8 @@
 
 set -eou pipefail
 
-GRADLE_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
-  ./gradlew deployDocs --no-daemon --stacktrace -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME
+echo "Logged in as user [$USER] with home directory [$HOME] in the current working directory [$PWD]"
+
+./gradlew deployDocs --no-daemon --stacktrace \
+ -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY \
+ -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME
diff --git a/ci/setup.sh b/ci/setup.sh
index 2466b511..4f7ee33f 100755
--- a/ci/setup.sh
+++ b/ci/setup.sh
@@ -1,7 +1,10 @@
 #!/bin/bash -x
 
-mkdir -p /tmp/jenkins-home
+## User ID 1001 is "jenkins"
+
+echo "Logged in as user [$USER] with home directory [$HOME] in the current working directory [$PWD]"
 chown -R 1001:1001 .
+mkdir -p /tmp/geode-build-cache
 echo "Logging into Docker..."
 docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}
 exit 0