Skip to content

Commit acdbfde

Browse files
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #1455
1 parent 683e059 commit acdbfde

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

Jenkinsfile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ pipeline {
3838
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
3939
sh 'mkdir -p /tmp/jenkins-home'
4040
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
41-
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'
41+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
42+
"./mvnw -s settings.xml -Pci,external-cassandra " +
43+
"clean dependency:list verify -Dsort -U -B"
4244
}
4345
}
4446
}
@@ -66,7 +68,9 @@ pipeline {
6668
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
6769
sh 'mkdir -p /tmp/jenkins-home'
6870
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
69-
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'
71+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
72+
"./mvnw -s settings.xml -Pci,external-cassandra " +
73+
"clean dependency:list verify -Dsort -U -B"
7074
}
7175
}
7276
}
@@ -95,14 +99,15 @@ pipeline {
9599
script {
96100
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
97101
sh 'mkdir -p /tmp/jenkins-home'
98-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
99-
'-Dartifactory.server=https://repo.spring.io ' +
102+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
103+
"./mvnw -s settings.xml -Pci,artifactory " +
104+
"-Dartifactory.server=${p['artifactory.url']} " +
100105
"-Dartifactory.username=${ARTIFACTORY_USR} " +
101106
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
102-
"-Dartifactory.staging-repository=libs-snapshot-local " +
107+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
103108
"-Dartifactory.build-name=spring-data-cassandra " +
104109
"-Dartifactory.build-number=${BUILD_NUMBER} " +
105-
'-Dmaven.test.skip=true clean deploy -U -B'
110+
"-Dmaven.test.skip=true clean deploy -U -B"
106111
}
107112
}
108113
}

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)