Skip to content

Commit 7b927d6

Browse files
committed
DATAREDIS-1220 - Migrate back to non-root CI.
1 parent b71367f commit 7b927d6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pipeline {
8585
docker {
8686
image 'springci/spring-data-openjdk8-with-redis-6.0:latest'
8787
label 'data'
88-
args '-u root -v $HOME/.m2:/tmp/jenkins-home/.m2'
88+
args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
8989
}
9090
}
9191
options { timeout(time: 30, unit: 'MINUTES') }
@@ -107,7 +107,7 @@ pipeline {
107107
docker {
108108
image 'springci/spring-data-openjdk11-with-redis-6.0:latest'
109109
label 'data'
110-
args '-u root -v $HOME/.m2:/tmp/jenkins-home/.m2'
110+
args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
111111
}
112112
}
113113
options { timeout(time: 30, unit: 'MINUTES') }
@@ -120,7 +120,7 @@ pipeline {
120120
docker {
121121
image 'springci/spring-data-openjdk15-with-redis-6.0:latest'
122122
label 'data'
123-
args '-u root -v $HOME/.m2:/tmp/jenkins-home/.m2'
123+
args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
124124
}
125125
}
126126
options { timeout(time: 30, unit: 'MINUTES') }

ci/test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ rm -f work
88
cwd=$(pwd)
99

1010
# Launch Redis in proper configuration
11-
pushd / && make -f $cwd/Makefile start && popd
11+
pushd /tmp && ln -s /work && make -f $cwd/Makefile start && popd
1212

1313
# Execute maven test
14-
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
14+
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean test -P${PROFILE} -DrunLongTests=${LONG_TESTS:-false} -B
1515

1616
# Capture resulting exit code from maven (pass/fail)
1717
RESULT=$?
1818

1919
# Shutdown Redis
20-
pushd / && make -f $cwd/Makefile stop && popd
20+
pushd /tmp && make -f $cwd/Makefile stop && popd
2121

2222
# Return maven results
2323
exit $RESULT

0 commit comments

Comments
 (0)