Switch to Broadcom docker proxy.

mp911de · mp911de · commit 9e4e6266e050 · 2024-06-20T14:07:58.000+02:00
Closes #2929
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -122,8 +122,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"
+						}
 					}
 				}
 			}
@@ -150,8 +152,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"
+								}
 							}
 						}
 					}
@@ -168,8 +172,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("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"
+								}
 							}
 						}
 					}
@@ -186,8 +192,10 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-7.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-7.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"
+								}
 							}
 						}
 					}
@@ -205,8 +213,10 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-valkey-7.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-valkey-7.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"
+								}
 							}
 						}
 					}
@@ -235,19 +245,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
@@ -26,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

Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,10 @@ pipeline {`
`122`	`122`	`}`
`123`	`123`	`steps {`
`124`	`124`	`script {`
`125`		`- 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') {`
`126`		`- sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`125`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`126`	`+ docker.image("springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
	`127`	`+ sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`128`	`+ }`
`127`	`129`	`}`
`128`	`130`	`}`
`129`	`131`	`}`
`@@ -150,8 +152,10 @@ pipeline {`
`150`	`152`	`}`
`151`	`153`	`steps {`
`152`	`154`	`script {`
`153`		`- 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') {`
`154`		`- sh "PROFILE=runtimehints LONG_TESTS=false JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`155`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`156`	`+ docker.image("springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
	`157`	`+ sh "PROFILE=runtimehints LONG_TESTS=false JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`158`	`+ }`
`155`	`159`	`}`
`156`	`160`	`}`
`157`	`161`	`}`
`@@ -168,8 +172,10 @@ pipeline {`
`168`	`172`	`}`
`169`	`173`	`steps {`
`170`	`174`	`script {`
`171`		`- 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') {`
`172`		`- sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`175`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`176`	`+ docker.image("springci/spring-data-with-redis-6.2:${p['java.next.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
	`177`	`+ sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`178`	`+ }`
`173`	`179`	`}`
`174`	`180`	`}`
`175`	`181`	`}`
`@@ -186,8 +192,10 @@ pipeline {`
`186`	`192`	`}`
`187`	`193`	`steps {`
`188`	`194`	`script {`
`189`		`- docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-7.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
`190`		`- sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`195`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`196`	`+ docker.image("springci/spring-data-with-redis-7.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
	`197`	`+ sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`198`	`+ }`
`191`	`199`	`}`
`192`	`200`	`}`
`193`	`201`	`}`
`@@ -205,8 +213,10 @@ pipeline {`
`205`	`213`	`}`
`206`	`214`	`steps {`
`207`	`215`	`script {`
`208`		`- docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-valkey-7.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
`209`		`- sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`216`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`217`	`+ docker.image("springci/spring-data-with-valkey-7.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {`
	`218`	`+ sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"`
	`219`	`+ }`
`210`	`220`	`}`
`211`	`221`	`}`
`212`	`222`	`}`
`@@ -235,19 +245,21 @@ pipeline {`
`235`	`245`
`236`	`246`	`steps {`
`237`	`247`	`script {`
`238`		`- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
`239`		`- sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
`240`		`- "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +`
`241`		`- "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +`
`242`		`- "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +`
`243`		`- "./mvnw -s settings.xml -Pci,artifactory " +`
`244`		`- "-Dartifactory.server=${p['artifactory.url']} " +`
`245`		`- "-Dartifactory.username=${ARTIFACTORY_USR} " +`
`246`		`- "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`247`		`- "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +`
`248`		`- "-Dartifactory.build-name=spring-data-redis " +`
`249`		`- "-Dartifactory.build-number=spring-data-redis-${BRANCH_NAME}-build-${BUILD_NUMBER} " +`
`250`		`- "-Dmaven.test.skip=true clean deploy -U -B"`
	`248`	`+ docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {`
	`249`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
	`250`	`+ sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +`
	`251`	`+ "DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +`
	`252`	`+ "DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +`
	`253`	`+ "GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +`
	`254`	`+ "./mvnw -s settings.xml -Pci,artifactory " +`
	`255`	`+ "-Dartifactory.server=${p['artifactory.url']} " +`
	`256`	`+ "-Dartifactory.username=${ARTIFACTORY_USR} " +`
	`257`	`+ "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
	`258`	`+ "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +`
	`259`	`+ "-Dartifactory.build-name=spring-data-redis " +`
	`260`	`+ "-Dartifactory.build-number=spring-data-redis-${BRANCH_NAME}-build-${BUILD_NUMBER} " +`
	`261`	`+ "-Dmaven.test.skip=true clean deploy -U -B"`
	`262`	`+ }`
`251`	`263`	`}`
`252`	`264`	`}`
`253`	`265`	`}`