Skip to content

Commit fd4aedc

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

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

Jenkinsfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,17 @@ 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 " +
107+
"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
107108
"-Dartifactory.server=${p['artifactory.url']} " +
108109
"-Dartifactory.username=${ARTIFACTORY_USR} " +
109110
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
110111
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
111112
"-Dartifactory.build-name=spring-data-relational " +
112113
"-Dartifactory.build-number=spring-data-relational-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
114+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc " +
113115
"-Dmaven.test.skip=true clean deploy -U -B"
114116
}
115117
}

ci/clean.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ set -euo pipefail
55
export JENKINS_USER=${JENKINS_USER_NAME}
66

77
MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
8-
./mvnw -s settings.xml -Dscan=false clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc
8+
./mvnw -s settings.xml -Dscan=false clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root

ci/run-tests-against-all-dbs.sh

-6
This file was deleted.

ci/test.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ 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

1615
MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
1716
./mvnw -s settings.xml \
18-
-P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc
17+
-P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root

0 commit comments

Comments
 (0)