Skip to content

Commit aea2d7b

Browse files
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #1455
1 parent b0d1053 commit aea2d7b

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

Jenkinsfile

+11-6
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ pipeline {
8181
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
8282
sh 'mkdir -p /tmp/jenkins-home'
8383
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
84-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
84+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
85+
"./mvnw -s settings.xml -Pci,external-cassandra " +
86+
"clean dependency:list verify -Dsort -U -B"
8587
}
8688
}
8789
}
@@ -109,7 +111,9 @@ pipeline {
109111
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
110112
sh 'mkdir -p /tmp/jenkins-home'
111113
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
112-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
114+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
115+
"./mvnw -s settings.xml -Pci,external-cassandra " +
116+
"clean dependency:list verify -Dsort -U -B"
113117
}
114118
}
115119
}
@@ -138,14 +142,15 @@ pipeline {
138142
script {
139143
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
140144
sh 'mkdir -p /tmp/jenkins-home'
141-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
142-
'-Dartifactory.server=https://repo.spring.io ' +
145+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
146+
"./mvnw -s settings.xml -Pci,artifactory " +
147+
"-Dartifactory.server=${p['artifactory.url']} " +
143148
"-Dartifactory.username=${ARTIFACTORY_USR} " +
144149
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
145-
"-Dartifactory.staging-repository=libs-snapshot-local " +
150+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
146151
"-Dartifactory.build-name=spring-data-cassandra " +
147152
"-Dartifactory.build-number=${BUILD_NUMBER} " +
148-
'-Dmaven.test.skip=true clean deploy -U -B'
153+
"-Dmaven.test.skip=true clean deploy -U -B"
149154
}
150155
}
151156
}

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)