Skip to content

Commit 27319a4

Browse files
committed
Consistently run all CI steps with the same user.
See #2982
1 parent cc533b2 commit 27319a4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: Jenkinsfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,16 @@ pipeline {
9999
steps {
100100
script {
101101
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
102-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
102+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
103103
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
104-
"./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root " +
104+
"./mvnw -s settings.xml -Pci,artifactory " +
105105
"-Dartifactory.server=${p['artifactory.url']} " +
106106
"-Dartifactory.username=${ARTIFACTORY_USR} " +
107107
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
108108
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
109109
"-Dartifactory.build-name=spring-data-elasticsearch " +
110110
"-Dartifactory.build-number=spring-data-elasticsearch-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
111+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch " +
111112
"-Dmaven.test.skip=true clean deploy -U -B"
112113
}
113114
}

Diff for: ci/verify.sh

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

55
mkdir -p /tmp/jenkins-home/.m2/spring-data-elasticsearch
6-
chown -R 1001:1001 .
76
export JENKINS_USER=${JENKINS_USER_NAME}
87

98
MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \

0 commit comments

Comments
 (0)