Skip to content

Commit d16d67b

Browse files
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #2988
1 parent b2cf93b commit d16d67b

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

Jenkinsfile

Lines changed: 9 additions & 6 deletions
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 verify -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 verify -Dsort -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 verify -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 verify -Dsort -B"
6668
}
6769
}
6870
}
@@ -90,14 +92,15 @@ pipeline {
9092
steps {
9193
script {
9294
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 ' +
95+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
96+
"./mvnw -s settings.xml -Pci,artifactory " +
97+
"-Dartifactory.server=${p['artifactory.url']} " +
9598
"-Dartifactory.username=${ARTIFACTORY_USR} " +
9699
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
97-
"-Dartifactory.staging-repository=libs-snapshot-local " +
100+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
98101
"-Dartifactory.build-name=spring-data-commons " +
99102
"-Dartifactory.build-number=${BUILD_NUMBER} " +
100-
'-Dmaven.test.skip=true clean deploy -U -B'
103+
"-Dmaven.test.skip=true clean deploy -U -B"
101104
}
102105
}
103106
}

ci/pipeline.properties

Lines changed: 3 additions & 0 deletions
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)