Switch to Broadcom docker proxy.

mp911de · mp911de · commit 98f34ea5d5f6 · 2024-06-20T14:08:39.000+02:00
Closes #2929
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -82,8 +82,10 @@ pipeline {
 			}
 			steps {
 				script {
-					docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
-						sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image("springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
+							sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
+						}
 					}
 				}
 			}
@@ -110,8 +112,10 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
-								sh "PROFILE=runtimehints LONG_TESTS=false JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								docker.image("springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
+									sh "PROFILE=runtimehints LONG_TESTS=false JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
+								}
 							}
 						}
 					}
@@ -128,8 +132,10 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.next.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
-								sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.next.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
+									sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
+								}
 							}
 						}
 					}
@@ -158,19 +164,21 @@ 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-redis " +
-								"-Dartifactory.build-number=spring-data-redis-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
-								"-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-redis " +
+									"-Dartifactory.build-number=spring-data-redis-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
+									"-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
@@ -25,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

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,10 @@ pipeline {`
`82`	`82`	`}`
`83`	`83`	`steps {`
`84`	`84`	`script {`
`85`		`- docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
`86`		`- sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`85`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`86`	`+ docker.image("springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
	`87`	`+ sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`88`	`+ }`
`87`	`89`	`}`
`88`	`90`	`}`
`89`	`91`	`}`
`@@ -110,8 +112,10 @@ pipeline {`
`110`	`112`	`}`
`111`	`113`	`steps {`
`112`	`114`	`script {`
`113`		`- docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
`114`		`- sh "PROFILE=runtimehints LONG_TESTS=false JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`115`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`116`	`+ docker.image("springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
	`117`	`+ sh "PROFILE=runtimehints LONG_TESTS=false JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`118`	`+ }`
`115`	`119`	`}`
`116`	`120`	`}`
`117`	`121`	`}`
`@@ -128,8 +132,10 @@ pipeline {`
`128`	`132`	`}`
`129`	`133`	`steps {`
`130`	`134`	`script {`
`131`		`- docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.next.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
`132`		`- sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`135`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`136`	`+ docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.next.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
	`137`	`+ sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`138`	`+ }`
`133`	`139`	`}`
`134`	`140`	`}`
`135`	`141`	`}`
`@@ -158,19 +164,21 @@ pipeline {`
`158`	`164`
`159`	`165`	`steps {`
`160`	`166`	`script {`
`161`		`- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
`162`		`- sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
`163`		`- "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +`
`164`		`- "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +`
`165`		`- "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +`
`166`		`- "./mvnw -s settings.xml -Pci,artifactory " +`
`167`		`- "-Dartifactory.server=${p['artifactory.url']} " +`
`168`		`- "-Dartifactory.username=${ARTIFACTORY_USR} " +`
`169`		`- "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`170`		`- "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +`
`171`		`- "-Dartifactory.build-name=spring-data-redis " +`
`172`		`- "-Dartifactory.build-number=spring-data-redis-${BRANCH_NAME}-build-${BUILD_NUMBER} " +`
`173`		`- "-Dmaven.test.skip=true clean deploy -U -B"`
	`167`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`168`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
	`169`	`+ sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
	`170`	`+ "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +`
	`171`	`+ "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +`
	`172`	`+ "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +`
	`173`	`+ "./mvnw -s settings.xml -Pci,artifactory " +`
	`174`	`+ "-Dartifactory.server=${p['artifactory.url']} " +`
	`175`	`+ "-Dartifactory.username=${ARTIFACTORY_USR} " +`
	`176`	`+ "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
	`177`	`+ "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +`
	`178`	`+ "-Dartifactory.build-name=spring-data-redis " +`
	`179`	`+ "-Dartifactory.build-number=spring-data-redis-${BRANCH_NAME}-build-${BUILD_NUMBER} " +`
	`180`	`+ "-Dmaven.test.skip=true clean deploy -U -B"`
	`181`	`+ }`
`174`	`182`	`}`
`175`	`183`	`}`
`176`	`184`	`}`