Skip to content

Commit 4939f37

Browse files
committed
Remove Docker Registry login.
Closes #2327.
1 parent 47c1db5 commit 4939f37

File tree

1 file changed

+15
-23
lines changed

1 file changed

+15
-23
lines changed

Jenkinsfile

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,8 @@ pipeline {
9999
}
100100
steps {
101101
script {
102-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
103-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
104-
sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
105-
}
102+
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
103+
sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
106104
}
107105
}
108106
}
@@ -126,10 +124,8 @@ pipeline {
126124
}
127125
steps {
128126
script {
129-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
130-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.11.tag']}").inside(p['docker.java.inside.basic']) {
131-
sh 'PROFILE=none ci/test.sh'
132-
}
127+
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.11.tag']}").inside(p['docker.java.inside.basic']) {
128+
sh 'PROFILE=none ci/test.sh'
133129
}
134130
}
135131
}
@@ -144,10 +140,8 @@ pipeline {
144140
}
145141
steps {
146142
script {
147-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
148-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {
149-
sh 'PROFILE=none ci/test.sh'
150-
}
143+
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {
144+
sh 'PROFILE=none ci/test.sh'
151145
}
152146
}
153147
}
@@ -173,17 +167,15 @@ pipeline {
173167

174168
steps {
175169
script {
176-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
177-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
178-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
179-
'-Dartifactory.server=https://repo.spring.io ' +
180-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
181-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
182-
"-Dartifactory.staging-repository=libs-snapshot-local " +
183-
"-Dartifactory.build-name=spring-data-redis " +
184-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
185-
'-Dmaven.test.skip=true clean deploy -U -B'
186-
}
170+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
171+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
172+
'-Dartifactory.server=https://repo.spring.io ' +
173+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
174+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
175+
"-Dartifactory.staging-repository=libs-snapshot-local " +
176+
"-Dartifactory.build-name=spring-data-redis " +
177+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
178+
'-Dmaven.test.skip=true clean deploy -U -B'
187179
}
188180
}
189181
}

0 commit comments

Comments
 (0)