pbTests: Allow use of default values for make-adopt-build-farm.sh

Signed-off-by: Stewart X Addison <[email protected]>
adoptium · Feb 24, 2021 · 933180c · 933180c
1 parent 444e733
commit 933180c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 66 deletions.
diff --git a/ansible/pbTestScripts/buildJDK.sh b/ansible/pbTestScripts/buildJDK.sh
@@ -63,7 +63,6 @@ checkJDK() {
 		echo "i.e. The following formats will work for jdk8: 'jdk8u', 'jdk8' , '8'"
 		exit 1
 	fi
-	setBootJDK
 	if ((JAVA_TO_BUILD <= JDK_GA)); then
 		JAVA_TO_BUILD="jdk${JAVA_TO_BUILD}u"
 	elif ((JAVA_TO_BUILD == JDK_MAX)); then
@@ -73,32 +72,6 @@ checkJDK() {
 	fi
 }
 
-setBootJDK() {
-        local buildJDKNumber=$JAVA_TO_BUILD
-        local bootJDKNumber=$((buildJDKNumber - 1))
-        # Use latest GA as JDK_BOOT_DIR if building above JDK_GA
-        if ((bootJDKNumber > JDK_GA)); then bootJDKNumber=$JDK_GA; fi
-        # Refer to 8 as 'jdk8'. Anything else is 'jdk-XX'
-        [[ $bootJDKNumber != "8" ]] && bootJDKNumber="-$bootJDKNumber"
-        if [[ $buildJDKNumber -eq 8 ]]; then
-                # CentOS JDK7
-                export JDK_BOOT_DIR=$(find /usr/lib/jvm -maxdepth 1 -name java-1.7.0-openjdk.x86_64)
-                # Ubuntu JDK7
-                [[ -z "$JDK_BOOT_DIR" ]] && export JDK_BOOT_DIR=$(find /usr/lib/jvm/ -maxdepth 1 -name java-1.7.0-openjdk-\*)
-                # Zulu-7 for OSs without JDK7
-                [[ -z "$JDK_BOOT_DIR" ]] && export JDK_BOOT_DIR=$(find /usr/lib/jvm/ -maxdepth 1 -name zulu7)
-        else
-                export JDK_BOOT_DIR=/usr/lib/jvm/jdk${bootJDKNumber}
-        fi
-        # If JDK (jdkToBuild - 1) can't be found, look for equal boot and build jdk
-        if [ -z "${JDK_BOOT_DIR}" ]
-        then
-                [[ $buildJDKNumber != "8" ]] && buildJDKNumber="-$buildJDKNumber"
-                echo "Can't find jdk$bootJDKNumber to build JDK, looking for jdk$buildJDKNumber"
-                export JDK_BOOT_DIR=/usr/lib/jvm/jdk${buildJDKNumber}
-        fi
-}
-
 cloneRepo() {
 	local branch=""
 	IFS='/' read -r -a urlArray <<< "$GIT_URL"
@@ -123,11 +96,6 @@ cloneRepo() {
 }
 
 # Default values
-export JAVA_TO_BUILD=jdk8u
-export PATH=/usr/local/bin/:$PATH
-export TARGET_OS=linux
-export VARIANT=openj9
-export ARCHITECTURE=x64
 GIT_URL="https://github.com/adoptopenjdk/openjdk-build"
 CLEAN_WORKSPACE=false
 JDK_MAX=
@@ -136,15 +104,6 @@ JDK_GA=
 setJDKVars
 processArgs $*
 
-# All architectures are referred to in make-adopt-build-farm.sh, except x86_64, which is 'x64'
-unameOutput=$(uname -m)
-if [[ ${unameOutput} != "x86_64" ]]; then
-       export ARCHITECTURE=${unameOutput}
-fi
-
-# Use the JDK8 installed with the adoptopenjdk_install role to run Gradle with.
-export JAVA_HOME=/usr/lib/jvm/jdk8
-
 # Only build Hotspot on FreeBSD
 if [[ $(uname) == "FreeBSD" ]]; then
         echo "Running on FreeBSD"
@@ -162,29 +121,28 @@ if grep 'buster' /etc/*-release >/dev/null 2>&1; then
 	export CXX=/usr/bin/g++-7
 fi
 
-if [[ "$ARCHITECTURE" == "aarch64" && "$JAVA_TO_BUILD" == "jdk8u" && $VARIANT == "openj9" ]]; then
-	echo "Can't build OpenJ9 JDK8 on AARCH64, Defaulting to jdk11"
+if [[ "$(uname -m)" == "aarch64" && "$JAVA_TO_BUILD" == "jdk8u" && $VARIANT == "openj9" ]]; then
+	echo "Can't build OpenJ9 JDK8 on AARCH64, Resetting JAVA_TO_BUILD to jdk11u"
 	JAVA_TO_BUILD=jdk11u
-	JDK_BOOT_DIR=/usr/lib/jvm/jdk-10
 fi
 
-if [[ "$ARCHITECTURE" == "armv7l" && "$VARIANT" == "openj9" ]]; then
-	echo "Can't build an OpenJ9 JDK on ARMv7l, Defaulting to Hotspot"
+if [[ "$(uname -m)" == "armv7l" && "$VARIANT" == "openj9" ]]; then
+	echo "OpenJ9 VM does not support armv7l - resetting VARIANT to hotspot"
 	export VARIANT=hotspot
 fi
 
-export FILENAME="${JAVA_TO_BUILD}_${VARIANT}_${ARCHITECTURE}"
-
-echo "DEBUG:
-        TARGET_OS=$TARGET_OS
-        ARCHITECTURE=$ARCHITECTURE
-        JAVA_TO_BUILD=$JAVA_TO_BUILD
-        VARIANT=$VARIANT
-        JDK_BOOT_DIR=$JDK_BOOT_DIR
-        JAVA_HOME=$JAVA_HOME
-        WORKSPACE=$WORKSPACE
-        GIT_URL=$GIT_URL
-        FILENAME=$FILENAME"
+export FILENAME="java.tar.gz"
+
+echo "buildJDK.sh DEBUG:
+        TARGET_OS=${TARGET_OS:-}
+        ARCHITECTURE=${ARCHITECTURE:-}
+        JAVA_TO_BUILD=${JAVA_TO_BUILD:-}
+        VARIANT=${VARIANT:-}
+        JDK_BOOT_DIR=${JDK_BOOT_DIR:-}
+        JAVA_HOME=${JAVA_HOME:-}
+        WORKSPACE=${WORKSPACE:-}
+        GIT_URL=${GIT_URL:-}
+        FILENAME=${FILENAME:-}"
 
 cloneRepo 
 

diff --git a/ansible/pbTestScripts/buildJDKWin.sh b/ansible/pbTestScripts/buildJDKWin.sh
@@ -67,7 +67,6 @@ checkJDK() {
 		exit 1
 	fi
 	if ((JAVA_TO_BUILD == 8)); then
-		export JDK_BOOT_DIR=/cygdrive/c/openjdk/jdk-7
 		export JAVA_TO_BUILD="jdk8u"
 	elif ((JAVA_TO_BUILD > JDK_GA)); then
 		export JDK_BOOT_DIR=/cygdrive/c/openjdk/jdk-${JDK_GA}
@@ -77,7 +76,6 @@ checkJDK() {
 			export JAVA_TO_BUILD="jdk${JAVA_TO_BUILD}"
 		fi
 	else
-		export JDK_BOOT_DIR=/cygdrive/c/openjdk/jdk-$((JAVA_TO_BUILD - 1))
 		export JAVA_TO_BUILD="jdk${JAVA_TO_BUILD}u"
 	fi
 }
@@ -105,12 +103,6 @@ cloneRepo() {
 	fi
 }
 # Set defaults
-export JAVA_TO_BUILD=jdk8
-export JDK_BOOT_DIR=/cygdrive/c/openjdk/jdk-7
-export VARIANT=openj9
-export PATH=/usr/bin/:$PATH
-export TARGET_OS=windows
-export ARCHITECTURE=x64
 export JAVA_HOME=/cygdrive/c/openjdk/jdk-8
 
 GIT_URL=https://github.com/adoptopenjdk/openjdk-build