Switch to Broadcom docker proxy.

mp911de · mp911de · commit 2aeece8f6894 · 2024-06-20T14:20:27.000+02:00
Closes #3519
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -38,10 +38,12 @@ pipeline {
 			}
 			steps {
 				script {
-					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-						sh "PROFILE=all-dbs " +
-							"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.main.image']).inside(p['docker.java.inside.docker']) {
+							sh "PROFILE=all-dbs " +
+								"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+								"ci/test.sh"
+						}
 					}
 				}
 			}
@@ -70,10 +72,12 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=all-dbs,hibernate-62 " +
-									"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-62 " +
+										"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+										"ci/test.sh"
+								}
 							}
 						}
 					}
@@ -91,10 +95,12 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=all-dbs,hibernate-65-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-65-snapshots " +
+										"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+										"ci/test.sh"
+								}
 							}
 						}
 					}
@@ -112,10 +118,12 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=all-dbs,hibernate-66-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-66-snapshots " +
+										"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+										"ci/test.sh"
+								}
 							}
 						}
 					}
@@ -133,10 +141,12 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=all-dbs " +
-									"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 " +
+										"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+										"ci/test.sh"
+								}
 							}
 						}
 					}
@@ -154,10 +164,12 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=all-dbs,eclipselink-next " +
-									"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.main.image']).inside(p['docker.java.inside.docker']) {
+									sh "PROFILE=all-dbs,eclipselink-next " +
+										"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+										"ci/test.sh"
+								}
 							}
 						}
 					}
@@ -184,20 +196,22 @@ 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" ' +
-								"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
-								"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
-								"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
-								"./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.repo.local=/tmp/jenkins-home/.m2/spring-data-jpa-enterprise ' +
-								'-Dmaven.test.skip=true clean deploy -U -B '
+					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" ' +
+									"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
+									"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
+									"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
+									"./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.repo.local=/tmp/jenkins-home/.m2/spring-data-jpa-enterprise ' +
+									'-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=21.0.1_12-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
@@ -14,6 +14,7 @@ docker.mongodb.7.0.version=7.0.2
 
 # 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
@@ -25,6 +26,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
`@@ -38,10 +38,12 @@ pipeline {`
`38`	`38`	`}`
`39`	`39`	`steps {`
`40`	`40`	`script {`
`41`		`- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {`
`42`		`- sh "PROFILE=all-dbs " +`
`43`		`- "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
`44`		`- "ci/test.sh"`
	`41`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`42`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {`
	`43`	`+ sh "PROFILE=all-dbs " +`
	`44`	`+ "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
	`45`	`+ "ci/test.sh"`
	`46`	`+ }`
`45`	`47`	`}`
`46`	`48`	`}`
`47`	`49`	`}`
`@@ -70,10 +72,12 @@ pipeline {`
`70`	`72`	`}`
`71`	`73`	`steps {`
`72`	`74`	`script {`
`73`		`- docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
`74`		`- sh "PROFILE=all-dbs,hibernate-62 " +`
`75`		`- "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
`76`		`- "ci/test.sh"`
	`75`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`76`	`+ docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
	`77`	`+ sh "PROFILE=all-dbs,hibernate-62 " +`
	`78`	`+ "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
	`79`	`+ "ci/test.sh"`
	`80`	`+ }`
`77`	`81`	`}`
`78`	`82`	`}`
`79`	`83`	`}`
`@@ -91,10 +95,12 @@ pipeline {`
`91`	`95`	`}`
`92`	`96`	`steps {`
`93`	`97`	`script {`
`94`		`- docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
`95`		`- sh "PROFILE=all-dbs,hibernate-65-snapshots " +`
`96`		`- "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
`97`		`- "ci/test.sh"`
	`98`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`99`	`+ docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
	`100`	`+ sh "PROFILE=all-dbs,hibernate-65-snapshots " +`
	`101`	`+ "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
	`102`	`+ "ci/test.sh"`
	`103`	`+ }`
`98`	`104`	`}`
`99`	`105`	`}`
`100`	`106`	`}`
`@@ -112,10 +118,12 @@ pipeline {`
`112`	`118`	`}`
`113`	`119`	`steps {`
`114`	`120`	`script {`
`115`		`- docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
`116`		`- sh "PROFILE=all-dbs,hibernate-66-snapshots " +`
`117`		`- "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
`118`		`- "ci/test.sh"`
	`121`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`122`	`+ docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
	`123`	`+ sh "PROFILE=all-dbs,hibernate-66-snapshots " +`
	`124`	`+ "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
	`125`	`+ "ci/test.sh"`
	`126`	`+ }`
`119`	`127`	`}`
`120`	`128`	`}`
`121`	`129`	`}`
`@@ -133,10 +141,12 @@ pipeline {`
`133`	`141`	`}`
`134`	`142`	`steps {`
`135`	`143`	`script {`
`136`		`- docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
`137`		`- sh "PROFILE=all-dbs " +`
`138`		`- "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
`139`		`- "ci/test.sh"`
	`144`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`145`	`+ docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {`
	`146`	`+ sh "PROFILE=all-dbs " +`
	`147`	`+ "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
	`148`	`+ "ci/test.sh"`
	`149`	`+ }`
`140`	`150`	`}`
`141`	`151`	`}`
`142`	`152`	`}`
`@@ -154,10 +164,12 @@ pipeline {`
`154`	`164`	`}`
`155`	`165`	`steps {`
`156`	`166`	`script {`
`157`		`- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {`
`158`		`- sh "PROFILE=all-dbs,eclipselink-next " +`
`159`		`- "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
`160`		`- "ci/test.sh"`
	`167`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`168`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {`
	`169`	`+ sh "PROFILE=all-dbs,eclipselink-next " +`
	`170`	`+ "JENKINS_USER_NAME=${p['jenkins.user.name']} " +`
	`171`	`+ "ci/test.sh"`
	`172`	`+ }`
`161`	`173`	`}`
`162`	`174`	`}`
`163`	`175`	`}`
`@@ -184,20 +196,22 @@ pipeline {`
`184`	`196`	`}`
`185`	`197`	`steps {`
`186`	`198`	`script {`
`187`		`- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
`188`		`- sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
`189`		`- "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +`
`190`		`- "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +`
`191`		`- "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +`
`192`		`- "./mvnw -s settings.xml -Pci,artifactory " +`
`193`		`- "-Dartifactory.server=${p['artifactory.url']} " +`
`194`		`- "-Dartifactory.username=${ARTIFACTORY_USR} " +`
`195`		`- "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`196`		`- "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +`
`197`		`- "-Dartifactory.build-name=spring-data-jpa " +`
`198`		`- "-Dartifactory.build-number=spring-data-jpa-${BRANCH_NAME}-build-${BUILD_NUMBER} " +`
`199`		`- '-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jpa-enterprise ' +`
`200`		`- '-Dmaven.test.skip=true clean deploy -U -B '`
	`199`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`200`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
	`201`	`+ sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
	`202`	`+ "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +`
	`203`	`+ "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +`
	`204`	`+ "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +`
	`205`	`+ "./mvnw -s settings.xml -Pci,artifactory " +`
	`206`	`+ "-Dartifactory.server=${p['artifactory.url']} " +`
	`207`	`+ "-Dartifactory.username=${ARTIFACTORY_USR} " +`
	`208`	`+ "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
	`209`	`+ "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +`
	`210`	`+ "-Dartifactory.build-name=spring-data-jpa " +`
	`211`	`+ "-Dartifactory.build-number=spring-data-jpa-${BRANCH_NAME}-build-${BUILD_NUMBER} " +`
	`212`	`+ '-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jpa-enterprise ' +`
	`213`	`+ '-Dmaven.test.skip=true clean deploy -U -B '`
	`214`	`+ }`
`201`	`215`	`}`
`202`	`216`	`}`
`203`	`217`	`}`