Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 9e4e626

Browse files
committed
Switch to Broadcom docker proxy.
Closes #2929 
1 parent 4bc9574 commit 9e4e626

File tree

2 files changed

+39
-25
lines changed

2 files changed

+39
-25
lines changed

‎Jenkinsfile‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,10 @@ pipeline {
122122
}
123123
steps {
124124
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+
}
127129
}
128130
}
129131
}
@@ -150,8 +152,10 @@ pipeline {
150152
}
151153
steps {
152154
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+
}
155159
}
156160
}
157161
}
@@ -168,8 +172,10 @@ pipeline {
168172
}
169173
steps {
170174
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+
}
173179
}
174180
}
175181
}
@@ -186,8 +192,10 @@ pipeline {
186192
}
187193
steps {
188194
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+
}
191199
}
192200
}
193201
}
@@ -205,8 +213,10 @@ pipeline {
205213
}
206214
steps {
207215
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+
}
210220
}
211221
}
212222
}
@@ -235,19 +245,21 @@ pipeline {
235245

236246
steps {
237247
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+
}
251263
}
252264
}
253265
}

‎ci/pipeline.properties‎

Lines changed: 4 additions & 2 deletions
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=21.0.1_12-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
@@ -26,6 +26,8 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
2626
# Credentials
2727
docker.registry=
2828
docker.credentials=hub.docker.com-springbuildmaster
29+
docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
30+
docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
2931
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
3032
artifactory.url=https://repo.spring.io
3133
artifactory.repository.snapshot=libs-snapshot-local

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /