From 6629bfc4e0301c1a5904536b2fa3d9fcdd77cb85 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Sat, 13 May 2023 14:19:46 -0700
Subject: [PATCH] Switch Jenkins CI pipeline build to using Gradle clean build
 in ci/build.sh.

---
 Jenkinsfile | 4 ++--
 ci/build.sh | 6 ++++++
 ci/check.sh | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100755 ci/build.sh

diff --git a/Jenkinsfile b/Jenkinsfile
index 27eaf12e..0defc839 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,15 +35,15 @@ pipeline {
 							// Cleanup any prior build system resources
 							try {
 								sh "echo 'Clean up GemFire/Geode files & build artifacts...'"
-								sh "ci/cleanupGemFiles.sh"
 								sh "ci/cleanupArtifacts.sh"
+								sh "ci/cleanupGemFiles.sh"
 							}
 							catch (ignore) { }
 
 							// Run the SBDG project Gradle build using JDK 8 inside Docker
 							try {
 								sh "echo 'Building SBDG...'"
-								sh "ci/check.sh"
+								sh "ci/build.sh"
 							}
 							catch (e) {
 								currentBuild.result = "FAILED: build"
diff --git a/ci/build.sh b/ci/build.sh
new file mode 100755
index 00000000..14229552
--- /dev/null
+++ b/ci/build.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -x
+
+set -eou pipefail
+
+GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/build-gradle-cache" \
+ ./gradlew --no-daemon --refresh-dependencies --stacktrace clean build
diff --git a/ci/check.sh b/ci/check.sh
index 3911036e..24e3b269 100755
--- a/ci/check.sh
+++ b/ci/check.sh
@@ -3,4 +3,4 @@
 set -eou pipefail
 
 GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/build-gradle-cache" \
- ./gradlew clean check --no-daemon --refresh-dependencies --stacktrace
+ ./gradlew --no-daemon --refresh-dependencies --stacktrace clean check