Skip to content

Commit 1b30814

Browse files
mp911demp911de
committed
Switch to Broadcom docker proxy.
Closes #4731
1 parent 191e3d4 commit 1b30814

File tree

2 files changed

+57
-44
lines changed

2 files changed

+57
-44
lines changed

‎Jenkinsfile

+52-42
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,16 @@ pipeline {
116116
}
117117
steps {
118118
script {
119-
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']) {
120-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
121-
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
122-
sh 'sleep 10'
123-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
124-
sh 'sleep 15'
125-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
126-
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
119+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
120+
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
121+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
122+
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
123+
sh 'sleep 10'
124+
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
125+
sh 'sleep 15'
126+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
127+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
128+
}
127129
}
128130
}
129131
}
@@ -149,14 +151,16 @@ pipeline {
149151
}
150152
steps {
151153
script {
152-
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']) {
153-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
154-
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
155-
sh 'sleep 10'
156-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
157-
sh 'sleep 15'
158-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
159-
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
154+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
155+
docker.image("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
156+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
157+
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
158+
sh 'sleep 10'
159+
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
160+
sh 'sleep 15'
161+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
162+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
163+
}
160164
}
161165
}
162166
}
@@ -172,14 +176,16 @@ pipeline {
172176
}
173177
steps {
174178
script {
175-
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']) {
176-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
177-
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
178-
sh 'sleep 10'
179-
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
180-
sh 'sleep 15'
181-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
182-
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
179+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
180+
docker.image("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
181+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
182+
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
183+
sh 'sleep 10'
184+
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
185+
sh 'sleep 15'
186+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
187+
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
188+
}
183189
}
184190
}
185191
}
@@ -195,14 +201,16 @@ pipeline {
195201
}
196202
steps {
197203
script {
198-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
199-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
200-
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
201-
sh 'sleep 10'
202-
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
203-
sh 'sleep 15'
204-
sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
205-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
204+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
205+
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
206+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
207+
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
208+
sh 'sleep 10'
209+
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
210+
sh 'sleep 15'
211+
sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
212+
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
213+
}
206214
}
207215
}
208216
}
@@ -227,16 +235,18 @@ pipeline {
227235
}
228236
steps {
229237
script {
230-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
231-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
232-
"./mvnw -s settings.xml -Pci,artifactory " +
233-
"-Dartifactory.server=${p['artifactory.url']} " +
234-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
235-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
236-
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
237-
"-Dartifactory.build-name=spring-data-mongodb " +
238-
"-Dartifactory.build-number=spring-data-mongodb-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
239-
"-Dmaven.test.skip=true clean deploy -U -B"
238+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
239+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
240+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
241+
"./mvnw -s settings.xml -Pci,artifactory " +
242+
"-Dartifactory.server=${p['artifactory.url']} " +
243+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
244+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
245+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
246+
"-Dartifactory.build-name=spring-data-mongodb " +
247+
"-Dartifactory.build-number=spring-data-mongodb-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
248+
"-Dmaven.test.skip=true clean deploy -U -B"
249+
}
240250
}
241251
}
242252
}

‎ci/pipeline.properties

+5-2
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=20-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
@@ -13,6 +13,7 @@ docker.mongodb.6.0.version=6.0.10
1313

1414
# Supported versions of Redis
1515
docker.redis.6.version=6.2.13
16+
docker.redis.7.version=7.2.4
1617

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

0 commit comments

Comments
 (0)