Skip to content

Commit 0ea21e6

Browse files
committed
Consistently run all CI steps with the same user.
See #1883
1 parent 8622d70 commit 0ea21e6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ pipeline {
101101
steps {
102102
script {
103103
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
104-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
104+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
105105
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
106106
"./mvnw -s settings.xml -Pci,artifactory " +
107107
"-Dartifactory.server=${p['artifactory.url']} " +
@@ -110,6 +110,7 @@ pipeline {
110110
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
111111
"-Dartifactory.build-name=spring-data-relational " +
112112
"-Dartifactory.build-number=spring-data-relational-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
113+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc " +
113114
"-Dmaven.test.skip=true clean deploy -U -B"
114115
}
115116
}

ci/test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ cp spring-data-relational/src/test/java/org/springframework/data/ProxyImageNameS
99
cp spring-data-relational/src/test/java/org/springframework/data/ProxyImageNameSubstitutor.java spring-data-r2dbc/src/test/java/org/springframework/data
1010

1111
mkdir -p /tmp/jenkins-home
12-
chown -R 1001:1001 .
1312

1413
export JENKINS_USER=${JENKINS_USER_NAME}
1514

0 commit comments

Comments
 (0)