From c080e2d24775500dfb0726df0f4f37abf0a965d3 Mon Sep 17 00:00:00 2001 From: William Parker <52783864+Willsparker@users.noreply.github.com> Date: Thu, 6 Feb 2020 09:40:55 +0000 Subject: [PATCH] pbTests: Fixup last commit (#1126) --- ansible/pbTestScripts/buildJDK.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/pbTestScripts/buildJDK.sh b/ansible/pbTestScripts/buildJDK.sh index 9075b36940..cb6dfcefb5 100755 --- a/ansible/pbTestScripts/buildJDK.sh +++ b/ansible/pbTestScripts/buildJDK.sh @@ -18,12 +18,6 @@ if [ -z "${WORKSPACE:-}" ]; then WORKSPACE=$HOME fi -if [[ ! -d "$WORKSPACE/openjdk-build" ]]; then - git clone -b freebsd https://github.com/gdams/openjdk-build $WORKSPACE/openjdk-build $WORKSPACE/openjdk-build -else - git clone https://github.com/adoptopenjdk/openjdk-build $WORKSPACE/openjdk-build $WORKSPACE/openjdk-build -fi - export TARGET_OS=linux export VARIANT=openj9 export ARCHITECTURE=x64 @@ -62,5 +56,11 @@ echo "DEBUG: JAVA_HOME=$JAVA_HOME WORKSPACE=$WORKSPACE" +if [[ ! -d "$WORKSPACE/openjdk-build" && "$TARGET_OS" == "FreeBSD" ]]; then + git clone -b freebsd https://github.com/gdams/openjdk-build $WORKSPACE/openjdk-build +elif [[ ! -d "$WORKSPACE/openjdk-build" ]]; then + git clone https://github.com/adoptopenjdk/openjdk-build $WORKSPACE/openjdk-build +fi + cd $WORKSPACE/openjdk-build build-farm/make-adopt-build-farm.sh