Skip to content

Commit 3f3bc8a

Browse files
committed
Migrate off harbor proxy.
Closes #873
1 parent dc18f3e commit 3f3bc8a

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

Jenkinsfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ pipeline {
5959
}
6060
steps {
6161
script {
62-
docker.image("${p['docker.image']}").inside(p['docker.java.inside.basic']) {
63-
sh 'src/test/bash/create_certificates.sh'
64-
sh '/opt/vault/vault server -config=$(pwd)/src/test/bash/vault.conf &'
65-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
62+
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
63+
docker.image("${p['docker.image']}").inside(p['docker.java.inside.basic']) {
64+
sh 'src/test/bash/create_certificates.sh'
65+
sh '/opt/vault/vault server -config=$(pwd)/src/test/bash/vault.conf &'
66+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
67+
}
6668
}
6769
}
6870
}
@@ -80,13 +82,15 @@ pipeline {
8082
docker {
8183
image "${p['docker.image']}"
8284
args "${p['docker.java.inside.basic']}"
85+
registryUrl "${p['docker.proxy.registry']}"
86+
registryCredentialsId "${p['docker.proxy.credentials']}"
8387
}
8488
}
8589
options { timeout(time: 20, unit: 'MINUTES') }
8690

8791
environment {
8892
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
89-
SONATYPE = credentials('oss-login')
93+
SONATYPE = credentials('oss-s01-token')
9094
KEYRING = credentials('spring-signing-secring.gpg')
9195
PASSPHRASE = credentials('spring-gpg-passphrase')
9296
}

ci/pipeline.properties

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
java.main.tag=17.0.3_7-jdk
33

44
# Docker container images - standard
5-
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
5+
docker.java.main.image=eclipse-temurin:${java.main.tag}
66

77
# Main docker image name using during the CI build
88
docker.build.image.name=springci/spring-vault-openjdk17-vault:${java.main.tag}-${docker.vault.version}
9-
docker.image=harbor-repo.vmware.com/dockerhub-proxy-cache/${docker.build.image.name}
9+
docker.image=${docker.build.image.name}
1010

1111
# Supported versions of Vault
1212
docker.vault.version=1.11.1
@@ -15,7 +15,14 @@ docker.vault.version=1.11.1
1515
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
1616
docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
1717

18+
# Credentials
1819
# Credentials
1920
docker.registry=
2021
docker.credentials=hub.docker.com-springbuildmaster
22+
docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
23+
docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
2124
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
25+
artifactory.url=https://repo.spring.io
26+
artifactory.repository.snapshot=libs-snapshot-local
27+
develocity.access-key=gradle_enterprise_secret_access_key
28+
jenkins.user.name=spring-builds+jenkins

0 commit comments

Comments
 (0)