Skip to content

Commit 7535207

Browse files
committed
Consistently run all CI steps with the same user.
See #2951
1 parent 00c64b6 commit 7535207

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Jenkinsfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,16 @@ pipeline {
103103
steps {
104104
script {
105105
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
106-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
106+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
107107
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
108-
"./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root " +
108+
"./mvnw -s settings.xml -Pci,artifactory " +
109109
"-Dartifactory.server=${p['artifactory.url']} " +
110110
"-Dartifactory.username=${ARTIFACTORY_USR} " +
111111
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
112112
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
113113
"-Dartifactory.build-name=spring-data-neo4j " +
114114
"-Dartifactory.build-number=spring-data-neo4j-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
115+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j " +
115116
"-Dmaven.test.skip=true clean deploy -U -B"
116117
}
117118
}

ci/test.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
6-
chown -R 1001:1001 .
76

87
export JENKINS_USER=${JENKINS_USER_NAME}
98
export SDN_FORCE_REUSE_OF_CONTAINERS=true

0 commit comments

Comments
 (0)