Skip to content

Commit 83c1a01

Browse files
mp911demp911de
committed
Switch to Broadcom docker proxy.
Closes #2392
1 parent 09d74e3 commit 83c1a01

File tree

2 files changed

+46
-37
lines changed

2 files changed

+46
-37
lines changed

‎Jenkinsfile

+41-35
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,19 @@ pipeline {
3838
}
3939
steps {
4040
script {
41-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
42-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
43-
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
44-
sh 'sleep 10'
45-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
46-
sh 'sleep 15'
47-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
48-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
49-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
50-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
51-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
41+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
42+
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
43+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
44+
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
45+
sh 'sleep 10'
46+
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
47+
sh 'sleep 15'
48+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
49+
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
50+
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
51+
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
52+
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
53+
}
5254
}
5355
}
5456
}
@@ -75,17 +77,19 @@ pipeline {
7577
}
7678
steps {
7779
script {
78-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
79-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
80-
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
81-
sh 'sleep 10'
82-
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
83-
sh 'sleep 15'
84-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
85-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
86-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
87-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
88-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
80+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
81+
docker.image("springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
82+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
83+
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
84+
sh 'sleep 10'
85+
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
86+
sh 'sleep 15'
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 clean dependency:list test -Dsort -U -B -Pit'
92+
}
8993
}
9094
}
9195
}
@@ -114,19 +118,21 @@ pipeline {
114118

115119
steps {
116120
script {
117-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
118-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
119-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
120-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
121-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
122-
"./mvnw -s settings.xml -Pci,artifactory " +
123-
"-Dartifactory.server=${p['artifactory.url']} " +
124-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
125-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
126-
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
127-
"-Dartifactory.build-name=spring-data-rest " +
128-
"-Dartifactory.build-number=spring-data-rest-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
129-
"-Dmaven.test.skip=true clean deploy -U -B"
121+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
122+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
123+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
124+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
125+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
126+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
127+
"./mvnw -s settings.xml -Pci,artifactory " +
128+
"-Dartifactory.server=${p['artifactory.url']} " +
129+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
130+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
131+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
132+
"-Dartifactory.build-name=spring-data-rest " +
133+
"-Dartifactory.build-number=spring-data-rest-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
134+
"-Dmaven.test.skip=true clean deploy -U -B"
135+
}
130136
}
131137
}
132138
}

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