Skip to content

Commit 37a9767

Browse files
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #189
1 parent 641cbbd commit 37a9767

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
@@ -39,7 +39,8 @@ pipeline {
3939
steps {
4040
script {
4141
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
42-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -B -U'
42+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
43+
"./mvnw -Pwith-bom-client verify -B -U"
4344
}
4445
}
4546
}
@@ -65,7 +66,8 @@ pipeline {
6566
steps {
6667
script {
6768
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
68-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -B -U'
69+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
70+
"./mvnw -Pwith-bom-client verify -B -U"
6971
}
7072
}
7173
}
@@ -93,14 +95,15 @@ pipeline {
9395
steps {
9496
script {
9597
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
96-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Partifactory ' +
97-
'-Dartifactory.server=https://repo.spring.io ' +
98+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
99+
"./mvnw -Pci,artifactory " +
100+
"-Dartifactory.server=${p['artifactory.url']} " +
98101
"-Dartifactory.username=${ARTIFACTORY_USR} " +
99102
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
100-
"-Dartifactory.staging-repository=libs-snapshot-local " +
103+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
101104
"-Dartifactory.build-name=spring-data-bom " +
102105
"-Dartifactory.build-number=${BUILD_NUMBER} " +
103-
'-Dmaven.test.skip=true clean deploy -B -U'
106+
"-Dmaven.test.skip=true clean deploy -U -B"
104107
}
105108
}
106109
}

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)