Skip to content

Commit 11b559e

Browse files
committed
Switch to Broadcom docker proxy.
Closes #580
1 parent eb01b62 commit 11b559e

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

Jenkinsfile

+15-10
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ pipeline {
3535
}
3636
steps {
3737
script {
38-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
39-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
40-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
38+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
39+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
40+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
41+
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
42+
}
4143
}
4244
}
4345
}
@@ -62,9 +64,11 @@ pipeline {
6264
}
6365
steps {
6466
script {
65-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
66-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
67-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
67+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
68+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
69+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
70+
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
71+
}
6872
}
6973
}
7074
}
@@ -89,16 +93,17 @@ pipeline {
8993
}
9094
steps {
9195
script {
92-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
93-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
94-
"./mvnw -s settings.xml -Pci,artifactory " +
96+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
97+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
98+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
99+
"./mvnw -s settings.xml -Pci,artifactory " +
95100
"-Dartifactory.server=${p['artifactory.url']} " +
96101
"-Dartifactory.username=${ARTIFACTORY_USR} " +
97102
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
98103
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
99104
"-Dartifactory.build-name=spring-data-keyvalue " +
100105
"-Dartifactory.build-number=spring-data-keyvalue-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
101-
'-Dmaven.test.skip=true clean deploy -U -B'
106+
'-Dmaven.test.skip=true clean deploy -U -B'}
102107
}
103108
}
104109
}

ci/pipeline.properties

+5-2
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=20-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
@@ -13,6 +13,7 @@ docker.mongodb.6.0.version=6.0.10
1313

1414
# Supported versions of Redis
1515
docker.redis.6.version=6.2.13
16+
docker.redis.7.version=7.2.4
1617

1718
# Supported versions of Cassandra
1819
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 -
2425
# Credentials
2526
docker.registry=
2627
docker.credentials=hub.docker.com-springbuildmaster
28+
docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
29+
docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
2730
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
2831
artifactory.url=https://repo.spring.io
2932
artifactory.repository.snapshot=libs-snapshot-local

0 commit comments

Comments
 (0)