Skip to content

Commit 0d819a0

Browse files
committed
Consistently run all CI steps with the same user.
See #3610
1 parent 9adab35 commit 0d819a0

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Jenkinsfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ pipeline {
190190
steps {
191191
script {
192192
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
193-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
193+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
194194
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
195195
"./mvnw -s settings.xml -Pci,artifactory " +
196196
"-Dartifactory.server=${p['artifactory.url']} " +
@@ -199,8 +199,8 @@ pipeline {
199199
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
200200
"-Dartifactory.build-name=spring-data-jpa " +
201201
"-Dartifactory.build-number=spring-data-jpa-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
202-
'-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jpa-enterprise ' +
203-
'-Dmaven.test.skip=true clean deploy -U -B '
202+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jpa " +
203+
"-Dmaven.test.skip=true clean deploy -U -B "
204204
}
205205
}
206206
}

ci/test.sh

-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ set -euo pipefail
44

55
mkdir -p /tmp/jenkins-home/.m2/spring-data-jpa
66
mkdir -p /tmp/jenkins-home/.m2/.develocity
7-
chown -R 1001:1001 .
87

98
export JENKINS_USER=${JENKINS_USER_NAME}
109

@@ -14,5 +13,3 @@ MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
1413

1514
MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
1615
./mvnw -s settings.xml clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jpa
17-
18-
chown -R 1001:1001 /tmp/jenkins-home/.m2/.develocity

0 commit comments

Comments
 (0)