Skip to content

Commit 8235f88

Browse files
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #2336
1 parent e863062 commit 8235f88

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
@@ -42,7 +42,8 @@ pipeline {
4242
sh 'sleep 10'
4343
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
4444
sh 'sleep 15'
45-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
45+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
46+
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
4647
}
4748
}
4849
}
@@ -73,7 +74,8 @@ pipeline {
7374
sh 'sleep 10'
7475
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
7576
sh 'sleep 15'
76-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
77+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
78+
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
7779
}
7880
}
7981
}
@@ -101,14 +103,15 @@ pipeline {
101103
steps {
102104
script {
103105
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
104-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
105-
'-Dartifactory.server=https://repo.spring.io ' +
106+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
107+
"./mvnw -s settings.xml -Pci,artifactory " +
108+
"-Dartifactory.server=${p['artifactory.url']} " +
106109
"-Dartifactory.username=${ARTIFACTORY_USR} " +
107110
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
108-
"-Dartifactory.staging-repository=libs-snapshot-local " +
111+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
109112
"-Dartifactory.build-name=spring-data-rest " +
110113
"-Dartifactory.build-number=${BUILD_NUMBER} " +
111-
'-Dmaven.test.skip=true clean deploy -U -B'
114+
"-Dmaven.test.skip=true clean deploy -U -B"
112115
}
113116
}
114117
}

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)