From 3b47bac4e697748be61e7772bd41dcf3413213ae Mon Sep 17 00:00:00 2001 From: "Greg L. Turnquist" Date: Wed, 9 Dec 2020 12:47:27 -0600 Subject: [PATCH] DATAJDBC-642 - Use maven cache when cleaning. --- Jenkinsfile | 6 +++--- clean.sh | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100755 clean.sh diff --git a/Jenkinsfile b/Jenkinsfile index eb424fb57..9005f6855 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ pipeline { docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') { sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" sh "PROFILE=ci,all-dbs ./test.sh" - sh "./mvnw clean" + sh "./clean.sh" } } } @@ -65,7 +65,7 @@ pipeline { docker.image('adoptopenjdk/openjdk11:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') { sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" sh "PROFILE=ci,java11 ./test.sh" - sh "./mvnw clean" + sh "./clean.sh" } } } @@ -88,7 +88,7 @@ pipeline { docker.image('adoptopenjdk/openjdk15:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') { sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" sh "PROFILE=ci,java11 ./test.sh" - sh "./mvnw clean" + sh "./clean.sh" } } } diff --git a/clean.sh b/clean.sh new file mode 100755 index 000000000..35d31b82a --- /dev/null +++ b/clean.sh @@ -0,0 +1,6 @@ +#!/bin/bash -x + +set -euo pipefail + +MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \ + ./mvnw clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc