DATAREDIS-1220 - Migrate back to non-root CI.

This commit is contained in:
Greg L. Turnquist
2020-11-09 12:02:54 -06:00
parent b71367f051
commit 7b927d61c2
2 changed files with 6 additions and 6 deletions

6
Jenkinsfile vendored
View File

@@ -85,7 +85,7 @@ pipeline {
docker {
image 'springci/spring-data-openjdk8-with-redis-6.0:latest'
label 'data'
args '-u root -v $HOME/.m2:/tmp/jenkins-home/.m2'
args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
}
}
options { timeout(time: 30, unit: 'MINUTES') }
@@ -107,7 +107,7 @@ pipeline {
docker {
image 'springci/spring-data-openjdk11-with-redis-6.0:latest'
label 'data'
args '-u root -v $HOME/.m2:/tmp/jenkins-home/.m2'
args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
}
}
options { timeout(time: 30, unit: 'MINUTES') }
@@ -120,7 +120,7 @@ pipeline {
docker {
image 'springci/spring-data-openjdk15-with-redis-6.0:latest'
label 'data'
args '-u root -v $HOME/.m2:/tmp/jenkins-home/.m2'
args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
}
}
options { timeout(time: 30, unit: 'MINUTES') }

View File

@@ -8,16 +8,16 @@ rm -f work
cwd=$(pwd)
# Launch Redis in proper configuration
pushd / && make -f $cwd/Makefile start && popd
pushd /tmp && ln -s /work && make -f $cwd/Makefile start && popd
# Execute maven test
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean test -P${PROFILE} -DrunLongTests=${LONG_TESTS:-false} -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-redis
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean test -P${PROFILE} -DrunLongTests=${LONG_TESTS:-false} -B
# Capture resulting exit code from maven (pass/fail)
RESULT=$?
# Shutdown Redis
pushd / && make -f $cwd/Makefile stop && popd
pushd /tmp && make -f $cwd/Makefile stop && popd
# Return maven results
exit $RESULT