Skip to content

Commit 92260e7

Browse files
mp911demp911de
committed
Switch to Broadcom docker proxy.
Closes #4731
1 parent 72444ad commit 92260e7

File tree

2 files changed

+85
-70
lines changed

2 files changed

+85
-70
lines changed

‎Jenkinsfile‎

Lines changed: 80 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,19 @@ pipeline {
156156
}
157157
steps {
158158
script {
159-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
160-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
161-
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
162-
sh 'sleep 10'
163-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
164-
sh 'sleep 15'
165-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
166-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
167-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
168-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
169-
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
159+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
160+
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
161+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
162+
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
163+
sh 'sleep 10'
164+
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
165+
sh 'sleep 15'
166+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
167+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
168+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
169+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
170+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
171+
}
170172
}
171173
}
172174
}
@@ -193,17 +195,19 @@ pipeline {
193195
}
194196
steps {
195197
script {
196-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
197-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
198-
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
199-
sh 'sleep 10'
200-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
201-
sh 'sleep 15'
202-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
203-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
204-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
205-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
206-
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
198+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
199+
docker.image("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
200+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
201+
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
202+
sh 'sleep 10'
203+
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
204+
sh 'sleep 15'
205+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
206+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
207+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
208+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
209+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
210+
}
207211
}
208212
}
209213
}
@@ -221,17 +225,19 @@ pipeline {
221225
}
222226
steps {
223227
script {
224-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
225-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
226-
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
227-
sh 'sleep 10'
228-
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
229-
sh 'sleep 15'
230-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
231-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
232-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
233-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
234-
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
228+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
229+
docker.image("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
230+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
231+
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
232+
sh 'sleep 10'
233+
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
234+
sh 'sleep 15'
235+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
236+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
237+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
238+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
239+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
240+
}
235241
}
236242
}
237243
}
@@ -249,17 +255,19 @@ pipeline {
249255
}
250256
steps {
251257
script {
252-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-7.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
253-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
254-
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
255-
sh 'sleep 10'
256-
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
257-
sh 'sleep 15'
258-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
259-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
260-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
261-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
262-
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
258+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
259+
docker.image("springci/spring-data-with-mongodb-7.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
260+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
261+
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
262+
sh 'sleep 10'
263+
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
264+
sh 'sleep 15'
265+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
266+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
267+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
268+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
269+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
270+
}
263271
}
264272
}
265273
}
@@ -277,17 +285,19 @@ pipeline {
277285
}
278286
steps {
279287
script {
280-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-7.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
281-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
282-
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
283-
sh 'sleep 10'
284-
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
285-
sh 'sleep 15'
286-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
287-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
288-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
289-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
290-
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
288+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
289+
docker.image("springci/spring-data-with-mongodb-7.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
290+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
291+
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
292+
sh 'sleep 10'
293+
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
294+
sh 'sleep 15'
295+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
296+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
297+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
298+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
299+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
300+
}
291301
}
292302
}
293303
}
@@ -314,19 +324,21 @@ pipeline {
314324
}
315325
steps {
316326
script {
317-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
318-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
319-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
320-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
321-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
322-
"./mvnw -s settings.xml -Pci,artifactory " +
323-
"-Dartifactory.server=${p['artifactory.url']} " +
324-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
325-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
326-
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
327-
"-Dartifactory.build-name=spring-data-mongodb " +
328-
"-Dartifactory.build-number=spring-data-mongodb-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
329-
"-Dmaven.test.skip=true clean deploy -U -B"
327+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
328+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
329+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
330+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
331+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
332+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
333+
"./mvnw -s settings.xml -Pci,artifactory " +
334+
"-Dartifactory.server=${p['artifactory.url']} " +
335+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
336+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
337+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
338+
"-Dartifactory.build-name=spring-data-mongodb " +
339+
"-Dartifactory.build-number=spring-data-mongodb-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
340+
"-Dmaven.test.skip=true clean deploy -U -B"
341+
}
330342
}
331343
}
332344
}

‎ci/pipeline.properties‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ java.main.tag=17.0.9_9-jdk-focal
33
java.next.tag=21.0.1_12-jdk-jammy
44

55
# Docker container images - standard
6-
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
7-
docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
6+
docker.java.main.image=library/eclipse-temurin:${java.main.tag}
7+
docker.java.next.image=library/eclipse-temurin:${java.next.tag}
88

99
# Supported versions of MongoDB
1010
docker.mongodb.4.4.version=4.4.25
@@ -14,6 +14,7 @@ docker.mongodb.7.0.version=7.0.2
1414

1515
# Supported versions of Redis
1616
docker.redis.6.version=6.2.13
17+
docker.redis.7.version=7.2.4
1718

1819
# Supported versions of Cassandra
1920
docker.cassandra.3.version=3.11.16
@@ -25,6 +26,8 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
2526
# Credentials
2627
docker.registry=
2728
docker.credentials=hub.docker.com-springbuildmaster
29+
docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
30+
docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
2831
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
2932
artifactory.url=https://repo.spring.io
3033
artifactory.repository.snapshot=libs-snapshot-local

0 commit comments

Comments
 (0)