From 0f3945a42545d9000c5e5f4597846dd46791b0d9 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 22 Feb 2022 15:35:48 -0800 Subject: [PATCH] Remove use of temporary directories ('/tmp/geode/*') for bulid artifacts. The 'gradle.user.home' JVM System property no longer seems valid in Gradle 7.x. --- ci/check.sh | 2 +- ci/deployArtifacts.sh | 2 +- ci/deployDocs.sh | 2 +- ci/setup.sh | 5 +---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ci/check.sh b/ci/check.sh index 3911036e..d9f1cdfc 100755 --- a/ci/check.sh +++ b/ci/check.sh @@ -2,5 +2,5 @@ set -eou pipefail -GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/build-gradle-cache" \ +GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp" \ ./gradlew clean check --no-daemon --refresh-dependencies --stacktrace diff --git a/ci/deployArtifacts.sh b/ci/deployArtifacts.sh index ab63ea6b..06961d6d 100755 --- a/ci/deployArtifacts.sh +++ b/ci/deployArtifacts.sh @@ -9,7 +9,7 @@ echo "Deploying artifacts on host [$HOSTNAME]" # Syntax: `chown -R userId:groupId .` chown -R 1001:1001 . -GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/artifacts-gradle-cache" \ +GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp" \ ./gradlew publishArtifacts releasePublishedArtifacts --no-build-cache --no-configuration-cache --no-daemon --stacktrace \ -PartifactoryUsername=$ARTIFACTORY_USERNAME \ -PartifactoryPassword=$ARTIFACTORY_PASSWORD \ diff --git a/ci/deployDocs.sh b/ci/deployDocs.sh index d653bc05..7368dd8a 100755 --- a/ci/deployDocs.sh +++ b/ci/deployDocs.sh @@ -9,7 +9,7 @@ echo "Deploying docs on host [$HOSTNAME]" # Syntax: `chown -R userId:groupId .` chown -R 1001:1001 . -GRADLE_OPTS="--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED -Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/docs-gradle-cache" \ +GRADLE_OPTS="--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED -Duser.name=jenkins -Djava.io.tmpdir=/tmp" \ ./gradlew deployDocs --no-daemon --stacktrace \ -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY \ -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME diff --git a/ci/setup.sh b/ci/setup.sh index 0235c9b1..7df4f9e8 100755 --- a/ci/setup.sh +++ b/ci/setup.sh @@ -4,11 +4,8 @@ # Group ID 1001 is "jenkins" # Syntax: `chown -R userId:groupId .` -echo "Logged in as user [$USER] with home directory [$HOME] in the current working directory [$PWD]" +echo "Logged into Jenkins CI as user [$USER] with home directory [$HOME] in the current working directory [$PWD]" chown -R 1001:1001 . -mkdir -p /tmp/geode/boot/artifacts-gradle-cache -mkdir -p /tmp/geode/boot/build-gradle-cache -mkdir -p /tmp/geode/boot/docs-gradle-cache echo "Logging into Docker..." docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW} exit 0