Skip to content

Commit ec1ee03

Browse files
mp911demp911de
committed
Switch to Broadcom docker proxy.
Closes #580
1 parent bce9211 commit ec1ee03

File tree

2 files changed

+36
-27
lines changed

2 files changed

+36
-27
lines changed

‎Jenkinsfile

+31-25
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,14 @@ pipeline {
3737
}
3838
steps {
3939
script {
40-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
41-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
42-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
43-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
44-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
45-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
40+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
41+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
42+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
43+
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
44+
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
45+
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
46+
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
47+
}
4648
}
4749
}
4850
}
@@ -69,12 +71,14 @@ pipeline {
6971
}
7072
steps {
7173
script {
72-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
73-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
74-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
75-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
76-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
77-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
74+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
75+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
76+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
77+
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
78+
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
79+
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
80+
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
81+
}
7882
}
7983
}
8084
}
@@ -101,19 +105,21 @@ pipeline {
101105
}
102106
steps {
103107
script {
104-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
105-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
106-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
107-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
108-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
109-
"./mvnw -s settings.xml -Pci,artifactory " +
110-
"-Dartifactory.server=${p['artifactory.url']} " +
111-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
112-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
113-
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
114-
"-Dartifactory.build-name=spring-data-keyvalue " +
115-
"-Dartifactory.build-number=spring-data-keyvalue-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
116-
'-Dmaven.test.skip=true clean deploy -U -B'
108+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
109+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
110+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
111+
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
112+
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
113+
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
114+
"./mvnw -s settings.xml -Pci,artifactory " +
115+
"-Dartifactory.server=${p['artifactory.url']} " +
116+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
117+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
118+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
119+
"-Dartifactory.build-name=spring-data-keyvalue " +
120+
"-Dartifactory.build-number=spring-data-keyvalue-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
121+
'-Dmaven.test.skip=true clean deploy -U -B'
122+
}
117123
}
118124
}
119125
}

‎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=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
@@ -14,6 +14,7 @@ docker.mongodb.7.0.version=7.0.2
1414

1515
# Supported versions of Redis
1616
docker.redis.6.version=6.2.13
17+
docker.redis.7.version=7.2.4
1718

1819
# Supported versions of Cassandra
1920
docker.cassandra.3.version=3.11.16
@@ -25,6 +26,8 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
2526
# Credentials
2627
docker.registry=
2728
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
2831
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
2932
artifactory.url=https://repo.spring.io
3033
artifactory.repository.snapshot=libs-snapshot-local

0 commit comments

Comments
 (0)