From e42124bbacccee6e738035f7f43b0bb03dbd8485 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Mon, 16 May 2022 11:16:35 -0700
Subject: [PATCH] Remove Docker Registry login.

Closes #1248.
---
 Jenkinsfile | 50 +++++++++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 20cffe475..96ec760f2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,12 +37,10 @@ pipeline {
 
 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-							sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-							sh "PROFILE=ci,all-dbs ci/test.sh"
-							sh "ci/clean.sh"
-						}
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+						sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
+						sh "PROFILE=ci,all-dbs ci/test.sh"
+						sh "ci/clean.sh"
 					}
 				}
 			}
@@ -69,12 +67,10 @@ pipeline {
 
 					steps {
 						script {
-							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-								docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.docker']) {
-									sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-									sh "PROFILE=ci ci/test.sh"
-									sh "ci/clean.sh"
-								}
+							docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.docker']) {
+								sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
+								sh "PROFILE=ci ci/test.sh"
+								sh "ci/clean.sh"
 							}
 						}
 					}
@@ -93,12 +89,10 @@ pipeline {
 
 					steps {
 						script {
-							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-								docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
-									sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-									sh "PROFILE=ci ci/test.sh"
-									sh "ci/clean.sh"
-								}
+							docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
+								sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
+								sh "PROFILE=ci ci/test.sh"
+								sh "ci/clean.sh"
 							}
 						}
 					}
@@ -124,17 +118,15 @@ pipeline {
 
 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc-non-root ' +
-								'-Dartifactory.server=https://repo.spring.io ' +
-								"-Dartifactory.username=${ARTIFACTORY_USR} " +
-								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-								"-Dartifactory.staging-repository=libs-snapshot-local " +
-								"-Dartifactory.build-name=spring-data-jdbc " +
-								"-Dartifactory.build-number=${BUILD_NUMBER} " +
-								'-Dmaven.test.skip=true clean deploy -U -B'
-						}
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc-non-root ' +
+							'-Dartifactory.server=https://repo.spring.io ' +
+							"-Dartifactory.username=${ARTIFACTORY_USR} " +
+							"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+							"-Dartifactory.staging-repository=libs-snapshot-local " +
+							"-Dartifactory.build-name=spring-data-jdbc " +
+							"-Dartifactory.build-number=${BUILD_NUMBER} " +
+							'-Dmaven.test.skip=true clean deploy -U -B'
 					}
 				}
 			}