Skip to content

Commit 857014f

Browse files
mp911demp911de
committed
Polishing.
Extract docker credentials into properties file. Use tabs for indentation instead of spaces. See #3949
1 parent 97eff9b commit 857014f

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

‎Jenkinsfile

+20-20
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 {
@@ -22,37 +22,37 @@ pipeline {
2222
parallel {
2323
stage('Publish JDK (main) + MongoDB 4.0') {
2424
when {
25-
anyOf {
26-
changeset "ci/openjdk8-mongodb-4.0/**"
27-
changeset "ci/pipeline.properties"
28-
}
25+
anyOf {
26+
changeset "ci/openjdk8-mongodb-4.0/**"
27+
changeset "ci/pipeline.properties"
28+
}
2929
}
3030
agent { label 'data' }
3131
options { timeout(time: 30, unit: 'MINUTES') }
3232

3333
steps {
3434
script {
3535
def image = docker.build("springci/spring-data-with-mongodb-4.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.4.0.version']} ci/openjdk8-mongodb-4.0/")
36-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
36+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
3737
image.push()
3838
}
3939
}
4040
}
4141
}
4242
stage('Publish JDK (main) + MongoDB 4.4') {
4343
when {
44-
anyOf {
45-
changeset "ci/openjdk8-mongodb-4.4/**"
46-
changeset "ci/pipeline.properties"
47-
}
44+
anyOf {
45+
changeset "ci/openjdk8-mongodb-4.4/**"
46+
changeset "ci/pipeline.properties"
47+
}
4848
}
4949
agent { label 'data' }
5050
options { timeout(time: 30, unit: 'MINUTES') }
5151

5252
steps {
5353
script {
5454
def image = docker.build("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.4.4.version']} ci/openjdk8-mongodb-4.4/")
55-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
55+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
5656
image.push()
5757
}
5858
}
@@ -69,7 +69,7 @@ pipeline {
6969
steps {
7070
script {
7171
def image = docker.build("springci/spring-data-with-mongodb-4.4:${p['java.15.tag']}", "--build-arg BASE=${p['docker.java.15.image']} --build-arg MONGODB=${p['docker.mongodb.4.4.version']} ci/openjdk15-mongodb-4.4/")
72-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
72+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7373
image.push()
7474
}
7575
}
@@ -94,7 +94,7 @@ pipeline {
9494
}
9595
steps {
9696
script {
97-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
97+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
9898
docker.image("springci/spring-data-with-mongodb-4.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
9999
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
100100
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
@@ -126,7 +126,7 @@ pipeline {
126126
}
127127
steps {
128128
script {
129-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
129+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
130130
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
131131
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
132132
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
@@ -150,9 +150,9 @@ pipeline {
150150
}
151151
steps {
152152
script {
153-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
153+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
154154
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.15.tag']}").inside(p['docker.java.inside.basic']) {
155-
alwaysPull true
155+
alwaysPull true
156156
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
157157
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
158158
sh 'sleep 10'
@@ -185,7 +185,7 @@ pipeline {
185185

186186
steps {
187187
script {
188-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
188+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
189189
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
190190
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
191191
'-Dartifactory.server=https://repo.spring.io ' +
@@ -216,8 +216,8 @@ pipeline {
216216

217217
steps {
218218
script {
219-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
220-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
219+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
220+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
221221
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
222222
'-Dartifactory.server=https://repo.spring.io ' +
223223
"-Dartifactory.username=${ARTIFACTORY_USR} " +

0 commit comments

Comments
 (0)