Skip to content

Commit 68530f0

Browse files
mp911demp911de
committed
Polishing.
Extract docker credentials into properties file. Use tabs for indentation instead of spaces. See #3949
1 parent 742cc9e commit 68530f0

File tree

2 files changed

+59
-56
lines changed

2 files changed

+59
-56
lines changed

‎Jenkinsfile‎

Lines changed: 55 additions & 56 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 {
@@ -22,75 +22,75 @@ 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
}
5959
}
6060
}
61-
stage('Publish JDK (main) + MongoDB 5.0') {
61+
stage('Publish JDK (main) + MongoDB 5.0') {
6262
when {
63-
anyOf {
64-
changeset "ci/openjdk8-mongodb-5.0/**"
65-
changeset "ci/pipeline.properties"
66-
}
63+
anyOf {
64+
changeset "ci/openjdk8-mongodb-5.0/**"
65+
changeset "ci/pipeline.properties"
66+
}
6767
}
6868
agent { label 'data' }
6969
options { timeout(time: 30, unit: 'MINUTES') }
7070

7171
steps {
7272
script {
7373
def image = docker.build("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.5.0.version']} ci/openjdk8-mongodb-5.0/")
74-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
75-
image.push()
76-
}
77-
}
78-
}
79-
}
74+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
75+
image.push()
76+
}
77+
}
78+
}
79+
}
8080
stage('Publish JDK (LTS) + MongoDB 4.4') {
8181
when {
82-
anyOf {
83-
changeset "ci/openjdk17-mongodb-4.4/**"
84-
changeset "ci/pipeline.properties"
85-
}
82+
anyOf {
83+
changeset "ci/openjdk17-mongodb-4.4/**"
84+
changeset "ci/pipeline.properties"
85+
}
8686
}
8787
agent { label 'data' }
8888
options { timeout(time: 30, unit: 'MINUTES') }
8989

9090
steps {
9191
script {
92-
def image = docker.build("springci/spring-data-with-mongodb-4.4:${p['java.lts.tag']}", "--build-arg BASE=${p['docker.java.lts.image']} --build-arg MONGODB=${p['docker.mongodb.4.4.version']} ci/openjdk16-mongodb-4.4/")
93-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
92+
def image = docker.build("springci/spring-data-with-mongodb-4.4:${p['java.lts.tag']}", "--build-arg BASE=${p['docker.java.lts.image']} --build-arg MONGODB=${p['docker.mongodb.4.4.version']} ci/openjdk17-mongodb-4.4/")
93+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
9494
image.push()
9595
}
9696
}
@@ -116,7 +116,7 @@ pipeline {
116116
}
117117
steps {
118118
script {
119-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
119+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
120120
docker.image("springci/spring-data-with-mongodb-4.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
121121
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
122122
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
@@ -149,7 +149,7 @@ pipeline {
149149
}
150150
steps {
151151
script {
152-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
152+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
153153
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
154154
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
155155
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
@@ -164,28 +164,28 @@ pipeline {
164164
}
165165

166166
stage("test: mongodb 5.0 (main)") {
167-
agent {
168-
label 'data'
169-
}
170-
options { timeout(time: 30, unit: 'MINUTES') }
171-
environment {
172-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
173-
}
174-
steps {
175-
script {
176-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
177-
docker.image("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
178-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
179-
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
180-
sh 'sleep 10'
181-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
182-
sh 'sleep 15'
183-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
184-
}
185-
}
186-
}
187-
}
188-
}
167+
agent {
168+
label 'data'
169+
}
170+
options { timeout(time: 30, unit: 'MINUTES') }
171+
environment {
172+
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
173+
}
174+
steps {
175+
script {
176+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
177+
docker.image("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
178+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
179+
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
180+
sh 'sleep 10'
181+
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
182+
sh 'sleep 15'
183+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
184+
}
185+
}
186+
}
187+
}
188+
}
189189

190190
stage("test: baseline (LTS)") {
191191
agent {
@@ -197,9 +197,8 @@ pipeline {
197197
}
198198
steps {
199199
script {
200-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
200+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
201201
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {
202-
alwaysPull true
203202
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
204203
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
205204
sh 'sleep 10'
@@ -233,7 +232,7 @@ pipeline {
233232

234233
steps {
235234
script {
236-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
235+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
237236
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
238237
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
239238
'-Dartifactory.server=https://repo.spring.io ' +

‎ci/pipeline.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ docker.cassandra.3.version=3.11.10
2222
# Docker environment settings
2323
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
2424
docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
25+
26+
# Credentials
27+
docker.registry=
28+
docker.credentials=hub.docker.com-springbuildmaster

0 commit comments

Comments
 (0)