Skip to content

Commit 02fbea0

Browse files
committed
Switch to Broadcom docker proxy.
Closes #488
1 parent 77102ff commit 02fbea0

File tree

2 files changed

+24
-16
lines changed

2 files changed

+24
-16
lines changed

Jenkinsfile

+20-14
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ 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" ./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" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
41+
}
4042
}
4143
}
4244
}
@@ -61,8 +63,10 @@ pipeline {
6163
}
6264
steps {
6365
script {
64-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
65-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
66+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
67+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
68+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
69+
}
6670
}
6771
}
6872
}
@@ -87,16 +91,18 @@ pipeline {
8791
}
8892
steps {
8993
script {
90-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
91-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
92-
'./mvnw -s settings.xml -Pci,artifactory ' +
93-
"-Dartifactory.server=${p['artifactory.url']} " +
94-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
95-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
96-
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
97-
"-Dartifactory.build-name=spring-data-ldap " +
98-
"-Dartifactory.build-number=spring-data-ldap-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
99-
'-Dmaven.test.skip=true clean deploy -U -B '
94+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
95+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
96+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
97+
'./mvnw -s settings.xml -Pci,artifactory ' +
98+
"-Dartifactory.server=${p['artifactory.url']} " +
99+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
100+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
101+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
102+
"-Dartifactory.build-name=spring-data-ldap " +
103+
"-Dartifactory.build-number=spring-data-ldap-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
104+
'-Dmaven.test.skip=true clean deploy -U -B '
105+
}
100106
}
101107
}
102108
}

ci/pipeline.properties

+4-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
@@ -24,6 +24,8 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
2424
# Credentials
2525
docker.registry=
2626
docker.credentials=hub.docker.com-springbuildmaster
27+
docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
28+
docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
2729
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
2830
artifactory.url=https://repo.spring.io
2931
artifactory.repository.snapshot=libs-snapshot-local

0 commit comments

Comments
 (0)