Skip to content

Commit 6255d8f

Browse files
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #547
1 parent af10c52 commit 6255d8f

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

Jenkinsfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pipeline {
3838
steps {
3939
script {
4040
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
41-
sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
41+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
4242
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
4343
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
4444
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
@@ -70,7 +70,7 @@ pipeline {
7070
steps {
7171
script {
7272
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
73-
sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
73+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
7474
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
7575
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
7676
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
@@ -94,25 +94,23 @@ pipeline {
9494
label 'data'
9595
}
9696
options { timeout(time: 20, unit: 'MINUTES') }
97-
9897
environment {
9998
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
10099
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
101100
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
102101
}
103-
104102
steps {
105103
script {
106104
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
107-
sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
105+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
108106
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
109107
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
110108
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
111-
'./mvnw -s settings.xml -Pci,artifactory ' +
112-
'-Dartifactory.server=https://repo.spring.io ' +
109+
"./mvnw -s settings.xml -Pci,artifactory " +
110+
"-Dartifactory.server=${p['artifactory.url']} " +
113111
"-Dartifactory.username=${ARTIFACTORY_USR} " +
114112
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
115-
"-Dartifactory.staging-repository=libs-snapshot-local " +
113+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
116114
"-Dartifactory.build-name=spring-data-keyvalue " +
117115
"-Dartifactory.build-number=${BUILD_NUMBER} " +
118116
'-Dmaven.test.skip=true clean deploy -U -B'

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)