Skip to content

Commit 516f9ed

Browse files
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #454
1 parent fa447f7 commit 516f9ed

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

Jenkinsfile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ pipeline {
3131
}
3232
options { timeout(time: 30, unit: 'MINUTES') }
3333
environment {
34-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
34+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
3535
}
3636
steps {
3737
script {
3838
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
39-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
39+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
4040
}
4141
}
4242
}
@@ -62,7 +62,7 @@ pipeline {
6262
steps {
6363
script {
6464
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
65-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
65+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
6666
}
6767
}
6868
}
@@ -82,22 +82,21 @@ pipeline {
8282
label 'data'
8383
}
8484
options { timeout(time: 20, unit: 'MINUTES') }
85-
8685
environment {
87-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
86+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
8887
}
89-
9088
steps {
9189
script {
9290
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
93-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
94-
'-Dartifactory.server=https://repo.spring.io ' +
91+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
92+
'./mvnw -s settings.xml -Pci,artifactory ' +
93+
"-Dartifactory.server=${p['artifactory.url']} " +
9594
"-Dartifactory.username=${ARTIFACTORY_USR} " +
9695
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
97-
"-Dartifactory.staging-repository=libs-snapshot-local " +
96+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
9897
"-Dartifactory.build-name=spring-data-ldap " +
9998
"-Dartifactory.build-number=${BUILD_NUMBER} " +
100-
'-Dmaven.test.skip=true clean deploy -U -B'
99+
'-Dmaven.test.skip=true clean deploy -U -B '
101100
}
102101
}
103102
}

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)