From 40939be53656cbd28b7aaf7a9fca7af54203ef9c Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Tue, 13 Apr 2021 16:26:40 -0700
Subject: [PATCH] [REVERT] Un-Dockerize the Jenkins CI build Stages.

---
 Jenkinsfile | 91 ++++++++++++++++++++++++-----------------------------
 1 file changed, 41 insertions(+), 50 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f20ba8ac..d0526b87 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,6 +4,10 @@ pipeline {
 		label "nogeode"
 	}
 
+	environment {
+		JAVA_HOME = "${tool 'jdk8'}"
+	}
+
 	options {
 		buildDiscarder(logRotator(numToKeepStr: '15'))
 		disableConcurrentBuilds()
@@ -24,33 +28,28 @@ pipeline {
 			}
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /usr/bin/docker:/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp') {
+					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 SBDG...'"
-								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 SBDG...'"
+						sh "ci/check.sh"
+					}
+					catch (e) {
+						currentBuild.result = "FAILED: build"
+						throw e
+					}
+					finally {
+						junit '**/build/test-results/*/*.xml'
 					}
 				}
 			}
@@ -59,17 +58,13 @@ pipeline {
 		stage ('Deploy Docs') {
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').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
-								}
-							}
+					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
 						}
 					}
 				}
@@ -79,20 +74,16 @@ pipeline {
 		stage ('Deploy Artifacts') {
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').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
-											}
-										}
+					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
 									}
 								}
 							}