Skip to content

Commit 5100eb4

Browse files
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #2835
1 parent 17f4588 commit 5100eb4

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

Jenkinsfile

+9-8
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ pipeline {
3939
steps {
4040
script {
4141
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
42-
sh "PROFILE=none ci/test.sh"
43-
sh "ci/clean.sh"
42+
sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
43+
sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
4444
}
4545
}
4646
}
@@ -67,8 +67,8 @@ pipeline {
6767
steps {
6868
script {
6969
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
70-
sh "PROFILE=none ci/test.sh"
71-
sh "ci/clean.sh"
70+
sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
71+
sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
7272
}
7373
}
7474
}
@@ -96,14 +96,15 @@ pipeline {
9696
steps {
9797
script {
9898
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
99-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root ' +
100-
'-Dartifactory.server=https://repo.spring.io ' +
99+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
100+
"./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root " +
101+
"-Dartifactory.server=${p['artifactory.url']} " +
101102
"-Dartifactory.username=${ARTIFACTORY_USR} " +
102103
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
103-
"-Dartifactory.staging-repository=libs-snapshot-local " +
104+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
104105
"-Dartifactory.build-name=spring-data-neo4j " +
105106
"-Dartifactory.build-number=${BUILD_NUMBER} " +
106-
'-Dmaven.test.skip=true clean deploy -U -B'
107+
"-Dmaven.test.skip=true clean deploy -U -B"
107108
}
108109
}
109110
}

ci/clean.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22

33
set -euo pipefail
44

5-
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
6-
./mvnw -s settings.xml clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j
5+
export JENKINS_USER=${JENKINS_USER_NAME}
6+
7+
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

ci/pipeline.properties

+3
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
2525
docker.registry=
2626
docker.credentials=hub.docker.com-springbuildmaster
2727
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
28+
artifactory.url=https://repo.spring.io
29+
artifactory.repository.snapshot=libs-snapshot-local
30+
jenkins.user.name=spring-builds+jenkins

ci/test.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@ set -euo pipefail
44

55
mkdir -p /tmp/jenkins-home
66
chown -R 1001:1001 .
7-
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home " \
7+
8+
export JENKINS_USER=${JENKINS_USER_NAME}
9+
10+
MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home -Dscan=false" \
811
./mvnw -s settings.xml -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j

0 commit comments

Comments
 (0)