Skip to content

Commit 44e562c

Browse files
committed
Polishing.
1 parent 79e1db9 commit 44e562c

File tree

1 file changed

+15
-21
lines changed

1 file changed

+15
-21
lines changed

Jenkinsfile

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
def p = [:]
22
node {
3-
checkout scm
4-
p = readProperties interpolate: true, file: 'ci/pipeline.properties'
3+
checkout scm
4+
p = readProperties interpolate: true, file: 'ci/pipeline.properties'
55
}
66

77
pipeline {
@@ -38,10 +38,8 @@ pipeline {
3838

3939
steps {
4040
script {
41-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
42-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
43-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -B -U'
44-
}
41+
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'
4543
}
4644
}
4745
}
@@ -66,10 +64,8 @@ pipeline {
6664
}
6765
steps {
6866
script {
69-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
70-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
71-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -B -U'
72-
}
67+
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'
7369
}
7470
}
7571
}
@@ -96,17 +92,15 @@ pipeline {
9692

9793
steps {
9894
script {
99-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
100-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
101-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Partifactory ' +
102-
'-Dartifactory.server=https://repo.spring.io ' +
103-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
104-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
105-
"-Dartifactory.staging-repository=libs-snapshot-local " +
106-
"-Dartifactory.build-name=spring-data-bom " +
107-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
108-
'-Dmaven.test.skip=true clean deploy -B -U'
109-
}
95+
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+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
99+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
100+
"-Dartifactory.staging-repository=libs-snapshot-local " +
101+
"-Dartifactory.build-name=spring-data-bom " +
102+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
103+
'-Dmaven.test.skip=true clean deploy -B -U'
110104
}
111105
}
112106
}

0 commit comments

Comments
 (0)