Skip to content

Commit 6ef1ddb

Browse files
mp911demp911de
committed
Switch from harbor-repo.vmware.com to packages.broadcom.com.
Closes #2263
1 parent e27f5dc commit 6ef1ddb

File tree

2 files changed

+35
-27
lines changed

2 files changed

+35
-27
lines changed

‎Jenkinsfile‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ pipeline {
3030
}
3131
steps {
3232
script {
33-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
34-
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
35-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
36-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
37-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
38-
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
33+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
34+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
35+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
36+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
37+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
38+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
39+
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
40+
}
3941
}
4042
}
4143
}
@@ -62,12 +64,14 @@ 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-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
68-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
69-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
70-
"./mvnw -s settings.xml clean dependency:list verify -Dsort -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+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
71+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
72+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
73+
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
74+
}
7175
}
7276
}
7377
}
@@ -89,19 +93,21 @@ 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-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
95-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
96-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
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-build " +
103-
"-Dartifactory.build-number=spring-data-build-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
104-
"-Dmaven.test.skip=true clean deploy -B -U"
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+
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
100+
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
101+
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
102+
"./mvnw -s settings.xml -Pci,artifactory " +
103+
"-Dartifactory.server=${p['artifactory.url']} " +
104+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
105+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
106+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
107+
"-Dartifactory.build-name=spring-data-build " +
108+
"-Dartifactory.build-number=spring-data-build-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
109+
"-Dmaven.test.skip=true clean deploy -B -U"
110+
}
105111
}
106112
}
107113
}

‎ci/pipeline.properties‎

Lines changed: 4 additions & 2 deletions
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
@@ -25,6 +25,8 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
2525
# Credentials
2626
docker.registry=
2727
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
2830
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
2931
artifactory.url=https://repo.spring.io
3032
artifactory.repository.snapshot=libs-snapshot-local

0 commit comments

Comments
 (0)