Skip to content

Commit 7868177

Browse files
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #547
1 parent c17a2d8 commit 7868177

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

Jenkinsfile

+8-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ pipeline {
3636
steps {
3737
script {
3838
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
39-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
39+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
40+
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
4041
}
4142
}
4243
}
@@ -62,7 +63,8 @@ pipeline {
6263
steps {
6364
script {
6465
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
65-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
66+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
67+
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
6668
}
6769
}
6870
}
@@ -82,19 +84,18 @@ pipeline {
8284
label 'data'
8385
}
8486
options { timeout(time: 20, unit: 'MINUTES') }
85-
8687
environment {
8788
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
8889
}
89-
9090
steps {
9191
script {
9292
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
93-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
94-
'-Dartifactory.server=https://repo.spring.io ' +
93+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
94+
"./mvnw -s settings.xml -Pci,artifactory " +
95+
"-Dartifactory.server=${p['artifactory.url']} " +
9596
"-Dartifactory.username=${ARTIFACTORY_USR} " +
9697
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
97-
"-Dartifactory.staging-repository=libs-snapshot-local " +
98+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
9899
"-Dartifactory.build-name=spring-data-keyvalue " +
99100
"-Dartifactory.build-number=${BUILD_NUMBER} " +
100101
'-Dmaven.test.skip=true clean deploy -U -B'

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

0 commit comments

Comments
 (0)