Switch to Broadcom docker proxy.

mp911de · mp911de · commit 596f2e5a15e4 · 2024-06-20T14:21:05.000+02:00
Closes #3519
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -36,9 +36,11 @@ pipeline {
 			}
 			steps {
 				script {
-					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-						sh 'PROFILE=all-dbs ci/test.sh'
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+							sh 'PROFILE=all-dbs ci/test.sh'
 						sh "ci/clean.sh"
+						}
 					}
 				}
 			}
@@ -67,10 +69,12 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=all-dbs,hibernate-64 " +
-									"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
-									"ci/test.sh"
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+									sh "PROFILE=all-dbs,hibernate-64 " +
+										"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+										"ci/test.sh"
+								}
 							}
 						}
 					}
@@ -88,10 +92,12 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=all-dbs,hibernate-64-snapshots " +
-									"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
-									"ci/test.sh"
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+									sh "PROFILE=all-dbs,hibernate-64-snapshots " +
+										"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+										"ci/test.sh"
+								}
 							}
 						}
 					}
@@ -109,10 +115,12 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=all-dbs,hibernate-65 " +
-									"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
-									"ci/test.sh"
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+									sh "PROFILE=all-dbs,hibernate-65 " +
+										"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+										"ci/test.sh"
+								}
 							}
 						}
 					}
@@ -128,9 +136,11 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh 'PROFILE=all-dbs ci/test.sh'
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+									sh 'PROFILE=all-dbs ci/test.sh'
 								sh "ci/clean.sh"
+								}
 							}
 						}
 					}
@@ -146,9 +156,11 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-								sh 'PROFILE=all-dbs,eclipselink-next ci/test.sh'
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+									sh 'PROFILE=all-dbs,eclipselink-next ci/test.sh'
 								sh "ci/clean.sh"
+								}
 							}
 						}
 					}
@@ -173,16 +185,17 @@ pipeline {
 			}
 			steps {
 				script {
-					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-						sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
-								"./mvnw -s settings.xml -Pci,artifactory " +
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+							sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
+									"./mvnw -s settings.xml -Pci,artifactory " +
 								"-Dartifactory.server=${p['artifactory.url']} " +
 								"-Dartifactory.username=${ARTIFACTORY_USR} " +
 								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
 								"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
 								"-Dartifactory.build-name=spring-data-jpa " +
 								"-Dartifactory.build-number=spring-data-jpa-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
-								'-Dmaven.test.skip=true clean deploy -U -B'
+								'-Dmaven.test.skip=true clean deploy -U -B'}
 					}
 				}
 			}
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
@@ -3,8 +3,8 @@ java.main.tag=17.0.9_9-jdk-focal
 java.next.tag=20-jdk-jammy
 
 # Docker container images - standard
-docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
-docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
+docker.java.main.image=library/eclipse-temurin:${java.main.tag}
+docker.java.next.image=library/eclipse-temurin:${java.next.tag}
 
 # Supported versions of MongoDB
 docker.mongodb.4.4.version=4.4.25
@@ -13,6 +13,7 @@ docker.mongodb.6.0.version=6.0.10
 
 # Supported versions of Redis
 docker.redis.6.version=6.2.13
+docker.redis.7.version=7.2.4
 
 # Supported versions of Cassandra
 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 -
 # Credentials
 docker.registry=
 docker.credentials=hub.docker.com-springbuildmaster
+docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
+docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
 artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
 artifactory.url=https://repo.spring.io
 artifactory.repository.snapshot=libs-snapshot-local
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/support/ProxyImageNameSubstitutor.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/support/ProxyImageNameSubstitutor.java
@@ -23,7 +23,7 @@
 /**
  * An {@link ImageNameSubstitutor} only used on CI servers to leverage internal proxy solution, that needs to vary the
  * prefix based on which container image is needed.
- * 
+ *
  * @author Greg Turnquist
  */
 public class ProxyImageNameSubstitutor extends ImageNameSubstitutor {
@@ -32,7 +32,7 @@ public class ProxyImageNameSubstitutor extends ImageNameSubstitutor {
 
 	private static final List<String> NAMES_TO_LIBRARY_PROXY_PREFIX = List.of("mysql", "postgres");
 
-	private static final String PROXY_PREFIX = "harbor-repo.vmware.com/dockerhub-proxy-cache/";
+	private static final String PROXY_PREFIX = "docker-hub.usw1.packages.broadcom.com/";
 
 	private static final String LIBRARY_PROXY_PREFIX = PROXY_PREFIX + "library/";
 

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,11 @@ pipeline {`
`36`	`36`	`}`
`37`	`37`	`steps {`
`38`	`38`	`script {`
`39`		`- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {`
`40`		`- sh 'PROFILE=all-dbs ci/test.sh'`
	`39`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`40`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {`
	`41`	`+ sh 'PROFILE=all-dbs ci/test.sh'`
`41`	`42`	`sh "ci/clean.sh"`
	`43`	`+ }`
`42`	`44`	`}`
`43`	`45`	`}`
`44`	`46`	`}`
`@@ -67,10 +69,12 @@ pipeline {`
`67`	`69`	`}`
`68`	`70`	`steps {`
`69`	`71`	`script {`
`70`		`- docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
`71`		`- sh "PROFILE=all-dbs,hibernate-64 " +`
`72`		`- "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
`73`		`- "ci/test.sh"`
	`72`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`73`	`+ docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
	`74`	`+ sh "PROFILE=all-dbs,hibernate-64 " +`
	`75`	`+ "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
	`76`	`+ "ci/test.sh"`
	`77`	`+ }`
`74`	`78`	`}`
`75`	`79`	`}`
`76`	`80`	`}`
`@@ -88,10 +92,12 @@ pipeline {`
`88`	`92`	`}`
`89`	`93`	`steps {`
`90`	`94`	`script {`
`91`		`- docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
`92`		`- sh "PROFILE=all-dbs,hibernate-64-snapshots " +`
`93`		`- "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
`94`		`- "ci/test.sh"`
	`95`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`96`	`+ docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
	`97`	`+ sh "PROFILE=all-dbs,hibernate-64-snapshots " +`
	`98`	`+ "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
	`99`	`+ "ci/test.sh"`
	`100`	`+ }`
`95`	`101`	`}`
`96`	`102`	`}`
`97`	`103`	`}`
`@@ -109,10 +115,12 @@ pipeline {`
`109`	`115`	`}`
`110`	`116`	`steps {`
`111`	`117`	`script {`
`112`		`- docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
`113`		`- sh "PROFILE=all-dbs,hibernate-65 " +`
`114`		`- "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
`115`		`- "ci/test.sh"`
	`118`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`119`	`+ docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
	`120`	`+ sh "PROFILE=all-dbs,hibernate-65 " +`
	`121`	`+ "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
	`122`	`+ "ci/test.sh"`
	`123`	`+ }`
`116`	`124`	`}`
`117`	`125`	`}`
`118`	`126`	`}`
`@@ -128,9 +136,11 @@ pipeline {`
`128`	`136`	`}`
`129`	`137`	`steps {`
`130`	`138`	`script {`
`131`		`- docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
`132`		`- sh 'PROFILE=all-dbs ci/test.sh'`
	`139`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`140`	`+ docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
	`141`	`+ sh 'PROFILE=all-dbs ci/test.sh'`
`133`	`142`	`sh "ci/clean.sh"`
	`143`	`+ }`
`134`	`144`	`}`
`135`	`145`	`}`
`136`	`146`	`}`
`@@ -146,9 +156,11 @@ pipeline {`
`146`	`156`	`}`
`147`	`157`	`steps {`
`148`	`158`	`script {`
`149`		`- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {`
`150`		`- sh 'PROFILE=all-dbs,eclipselink-next ci/test.sh'`
	`159`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`160`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {`
	`161`	`+ sh 'PROFILE=all-dbs,eclipselink-next ci/test.sh'`
`151`	`162`	`sh "ci/clean.sh"`
	`163`	`+ }`
`152`	`164`	`}`
`153`	`165`	`}`
`154`	`166`	`}`
`@@ -173,16 +185,17 @@ pipeline {`
`173`	`185`	`}`
`174`	`186`	`steps {`
`175`	`187`	`script {`
`176`		`- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
`177`		`- sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
`178`		`- "./mvnw -s settings.xml -Pci,artifactory " +`
	`188`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`189`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
	`190`	`+ sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
	`191`	`+ "./mvnw -s settings.xml -Pci,artifactory " +`
`179`	`192`	`"-Dartifactory.server=${p['artifactory.url']} " +`
`180`	`193`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`181`	`194`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`182`	`195`	`"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +`
`183`	`196`	`"-Dartifactory.build-name=spring-data-jpa " +`
`184`	`197`	`"-Dartifactory.build-number=spring-data-jpa-${BRANCH_NAME}-build-${BUILD_NUMBER} " +`
`185`		`- '-Dmaven.test.skip=true clean deploy -U -B'`
	`198`	`+ '-Dmaven.test.skip=true clean deploy -U -B'}`
`186`	`199`	`}`
`187`	`200`	`}`
`188`	`201`	`}`