Skip to content

Commit 0d331bd

Browse files
committed
Consistently run all CI steps with the same user.
See #2951
1 parent a0e535e commit 0d331bd

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

Jenkinsfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,17 @@ 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 " +
109+
"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
109110
"-Dartifactory.server=${p['artifactory.url']} " +
110111
"-Dartifactory.username=${ARTIFACTORY_USR} " +
111112
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
112113
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
113114
"-Dartifactory.build-name=spring-data-neo4j " +
114115
"-Dartifactory.build-number=spring-data-neo4j-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
116+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j " +
115117
"-Dmaven.test.skip=true clean deploy -U -B"
116118
}
117119
}

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 clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j
8+
./mvnw -s settings.xml clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root

ci/test.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
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
109
export SDN_NEO4J_VERSION=5.20
1110

1211
MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home -Dscan=false" \
13-
./mvnw -s settings.xml -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j
12+
./mvnw -s settings.xml -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root

0 commit comments

Comments
 (0)