From d82a8d0870543b7f0ada8789ea170e825cf8219f Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Wed, 4 May 2022 10:47:06 -0700
Subject: [PATCH] Remove Docker Registry access (login).

---
 Jenkinsfile            | 89 +++++++++++++++++++-----------------------
 ci/pipeline.properties |  4 +-
 2 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a1359ba..96b2f3e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,40 +21,35 @@ pipeline {
 	stages {
 
 		stage('Build') {
-			environment {
-				DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
-			}
 			options {
 				timeout(time: 15, unit: "MINUTES")
 			}
 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.full']) {
+					docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.full']) {
 
-							sh "echo 'Setup build environment...'"
-							sh "ci/setup.sh"
+						sh "echo 'Setup build environment...'"
+						sh "ci/setup.sh"
 
-							// Cleanup any prior build system resources
-							try {
-								sh "echo 'Clean up GemFire/Geode files & build artifacts...'"
-								sh "ci/cleanupGemFiles.sh"
-								sh "ci/cleanupArtifacts.sh"
-							}
-							catch (ignore) { }
+						// Cleanup any prior build system resources
+						try {
+							sh "echo 'Clean up GemFire/Geode files & build artifacts...'"
+							sh "ci/cleanupGemFiles.sh"
+							sh "ci/cleanupArtifacts.sh"
+						}
+						catch (ignore) { }
 
-							// Run the SBDG project Gradle build using JDK 8 inside Docker
-							try {
-								sh "echo 'Building SSDG...'"
-								sh "ci/check.sh"
-							}
-							catch (e) {
-								currentBuild.result = "FAILED: build"
-								throw e
-							}
-							finally {
-								junit '**/build/test-results/*/*.xml'
-							}
+						// Run the SBDG project Gradle build using JDK 8 inside Docker
+						try {
+							sh "echo 'Building SSDG...'"
+							sh "ci/check.sh"
+						}
+						catch (e) {
+							currentBuild.result = "FAILED: build"
+							throw e
+						}
+						finally {
+							junit '**/build/test-results/*/*.xml'
 						}
 					}
 				}
@@ -68,16 +63,14 @@ pipeline {
 			}
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('openjdk:17-bullseye').inside("--name ${env.HOSTNAME}Two -u root -v /tmp:/tmp") {
-							withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
-								try {
-									sh "ci/deployDocs.sh"
-								}
-								catch (e) {
-									currentBuild.result = "FAILED: deploy docs"
-									throw e
-								}
+					docker.image('openjdk:17-bullseye').inside("--name ${env.HOSTNAME}Two -u root -v /tmp:/tmp") {
+						withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
+							try {
+								sh "ci/deployDocs.sh"
+							}
+							catch (e) {
+								currentBuild.result = "FAILED: deploy docs"
+								throw e
 							}
 						}
 					}
@@ -92,19 +85,17 @@ pipeline {
 			}
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('openjdk:17-bullseye').inside("--name ${env.HOSTNAME}One -u root -v /tmp:/tmp") {
-							withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) {
-								withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) {
-									withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) {
-										withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {
-											try {
-												sh "ci/deployArtifacts.sh"
-											}
-											catch (e) {
-												currentBuild.result = "FAILED: deploy artifacts"
-												throw e
-											}
+					docker.image('openjdk:17-bullseye').inside("--name ${env.HOSTNAME}One -u root -v /tmp:/tmp") {
+						withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) {
+							withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) {
+								withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) {
+									withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {
+										try {
+											sh "ci/deployArtifacts.sh"
+										}
+										catch (e) {
+											currentBuild.result = "FAILED: deploy artifacts"
+											throw e
 										}
 									}
 								}
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 211e6ee..11a84a8 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -9,6 +9,6 @@ docker.container.inside.env.basic=-u root -v $HOME:/tmp/jenkins-home -v /tmp:/tm
 docker.container.inside.env.full=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /tmp:/tmp -v $HOME:/tmp/jenkins-home
 
 # Credentials
-docker.registry=
-docker.credentials=hub.docker.com-springbuildmaster
 artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
+docker.credentials=hub.docker.com-springbuildmaster
+docker.registry=