Skip to content

Commit a58223d

Browse files
mp911demp911de
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #4570
1 parent c731791 commit a58223d

File tree

2 files changed

+36
-35
lines changed

2 files changed

+36
-35
lines changed

‎Jenkinsfile‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ pipeline {
162162
sh 'sleep 10'
163163
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
164164
sh 'sleep 15'
165-
sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
166-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
167-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
168-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
169-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
165+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
166+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
167+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
168+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
169+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
170170
}
171171
}
172172
}
@@ -199,11 +199,11 @@ pipeline {
199199
sh 'sleep 10'
200200
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
201201
sh 'sleep 15'
202-
sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
203-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
204-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
205-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
206-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
202+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
203+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
204+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
205+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
206+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
207207
}
208208
}
209209
}
@@ -227,11 +227,11 @@ pipeline {
227227
sh 'sleep 10'
228228
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
229229
sh 'sleep 15'
230-
sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
231-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
232-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
233-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
234-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
230+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
231+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
232+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
233+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
234+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
235235
}
236236
}
237237
}
@@ -255,11 +255,11 @@ pipeline {
255255
sh 'sleep 10'
256256
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
257257
sh 'sleep 15'
258-
sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
259-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
260-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
261-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
262-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
258+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
259+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
260+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
261+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
262+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
263263
}
264264
}
265265
}
@@ -283,11 +283,11 @@ pipeline {
283283
sh 'sleep 10'
284284
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
285285
sh 'sleep 15'
286-
sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
287-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
288-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
289-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
290-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
286+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
287+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
288+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
289+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
290+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
291291
}
292292
}
293293
}
@@ -307,28 +307,26 @@ pipeline {
307307
label 'data'
308308
}
309309
options { timeout(time: 20, unit: 'MINUTES') }
310-
311310
environment {
312311
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
313312
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
314313
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
315314
}
316-
317315
steps {
318316
script {
319317
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
320-
sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
321-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
322-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
323-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
324-
'./mvnw -s settings.xml -Pci,artifactory ' +
325-
'-Dartifactory.server=https://repo.spring.io ' +
318+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
319+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
320+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
321+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
322+
"./mvnw -s settings.xml -Pci,artifactory " +
323+
"-Dartifactory.server=${p['artifactory.url']} " +
326324
"-Dartifactory.username=${ARTIFACTORY_USR} " +
327325
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
328-
"-Dartifactory.staging-repository=libs-snapshot-local " +
326+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
329327
"-Dartifactory.build-name=spring-data-mongodb " +
330328
"-Dartifactory.build-number=${BUILD_NUMBER} " +
331-
'-Dmaven.test.skip=true clean deploy -U -B'
329+
"-Dmaven.test.skip=true clean deploy -U -B"
332330
}
333331
}
334332
}

‎ci/pipeline.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,8 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
2626
docker.registry=
2727
docker.credentials=hub.docker.com-springbuildmaster
2828
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
29+
artifactory.url=https://repo.spring.io
30+
artifactory.repository.snapshot=libs-snapshot-local
2931
develocity.cache.credentials=gradle_enterprise_cache_user
3032
develocity.access-key=gradle_enterprise_secret_access_key
33+
jenkins.user.name=spring-builds+jenkins

0 commit comments

Comments
 (0)