Skip to content

Commit 43f2083

Browse files
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #2177
1 parent 7912ac3 commit 43f2083

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

Jenkinsfile

+9-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ pipeline {
2929
steps {
3030
script {
3131
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
32-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
32+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
33+
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
3334
}
3435
}
3536
}
@@ -55,7 +56,8 @@ pipeline {
5556
steps {
5657
script {
5758
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
58-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
59+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
60+
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
5961
}
6062
}
6163
}
@@ -76,14 +78,15 @@ pipeline {
7678
steps {
7779
script {
7880
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
79-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
80-
'-Dartifactory.server=https://repo.spring.io ' +
81+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
82+
"./mvnw -s settings.xml -Pci,artifactory " +
83+
"-Dartifactory.server=${p['artifactory.url']} " +
8184
"-Dartifactory.username=${ARTIFACTORY_USR} " +
8285
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
83-
"-Dartifactory.staging-repository=libs-snapshot-local " +
86+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
8487
"-Dartifactory.build-name=spring-data-build " +
8588
"-Dartifactory.build-number=${BUILD_NUMBER} " +
86-
'-Dmaven.test.skip=true clean deploy -B -U'
89+
"-Dmaven.test.skip=true clean deploy -B -U"
8790
}
8891
}
8992
}

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)