Skip to content

Commit 0d05602

Browse files
mp911demp911de
committed
Switch to Broadcom docker proxy.
Closes #1498
1 parent 10c79aa commit 0d05602

File tree

2 files changed

+43
-34
lines changed

2 files changed

+43
-34
lines changed

‎Jenkinsfile

+38-32
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,17 @@ pipeline {
8080
}
8181
steps {
8282
script {
83-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
84-
sh 'mkdir -p /tmp/jenkins-home'
85-
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
86-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
87-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
88-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
89-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
90-
"./mvnw -s settings.xml -Pci,external-cassandra " +
91-
"clean dependency:list verify -Dsort -U -B"
83+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
84+
docker.image("springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
85+
sh 'mkdir -p /tmp/jenkins-home'
86+
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
87+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
88+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
89+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
90+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
91+
"./mvnw -s settings.xml -Pci,external-cassandra " +
92+
"clean dependency:list verify -Dsort -U -B"
93+
}
9294
}
9395
}
9496
}
@@ -115,15 +117,17 @@ pipeline {
115117
}
116118
steps {
117119
script {
118-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
119-
sh 'mkdir -p /tmp/jenkins-home'
120-
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
121-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
122-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
123-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
124-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
125-
"./mvnw -s settings.xml -Pci,external-cassandra " +
126-
"clean dependency:list verify -Dsort -U -B"
120+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
121+
docker.image("springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
122+
sh 'mkdir -p /tmp/jenkins-home'
123+
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
124+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
125+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
126+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
127+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
128+
"./mvnw -s settings.xml -Pci,external-cassandra " +
129+
"clean dependency:list verify -Dsort -U -B"
130+
}
127131
}
128132
}
129133
}
@@ -152,20 +156,22 @@ pipeline {
152156

153157
steps {
154158
script {
155-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
156-
sh 'mkdir -p /tmp/jenkins-home'
157-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
158-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
159-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
160-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
161-
"./mvnw -s settings.xml -Pci,artifactory " +
162-
"-Dartifactory.server=${p['artifactory.url']} " +
163-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
164-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
165-
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
166-
"-Dartifactory.build-name=spring-data-cassandra " +
167-
"-Dartifactory.build-number=spring-data-cassandra-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
168-
"-Dmaven.test.skip=true clean deploy -U -B"
159+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
160+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
161+
sh 'mkdir -p /tmp/jenkins-home'
162+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
163+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
164+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
165+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
166+
"./mvnw -s settings.xml -Pci,artifactory " +
167+
"-Dartifactory.server=${p['artifactory.url']} " +
168+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
169+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
170+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
171+
"-Dartifactory.build-name=spring-data-cassandra " +
172+
"-Dartifactory.build-number=spring-data-cassandra-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
173+
"-Dmaven.test.skip=true clean deploy -U -B"
174+
}
169175
}
170176
}
171177
}

‎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)