Revert "Evergreen: Fix setting JAVA_HOME setting"

This reverts commit 5f2aa6c.
mongodb · Nov 11, 2021 · a188380 · a188380
1 parent daf764b
commit a188380
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/.evergreen/javaConfig.bash b/.evergreen/javaConfig.bash
@@ -4,10 +4,7 @@
 export JDK8="/opt/java/jdk8"
 export JDK11="/opt/java/jdk11"
 export JDK17="/opt/java/jdk17"
-
-if [ -d "$JDK11" ]; then
-  export JAVA_HOME=$JDK11
-fi
+export JAVA_HOME=$JDK11
 
 export JAVA_VERSION=${JDK:-11}
 

diff --git a/.evergreen/run-mongodb-aws-ecs-test.sh b/.evergreen/run-mongodb-aws-ecs-test.sh
@@ -12,6 +12,8 @@ set -o errexit  # Exit the script with error if any of the commands fail
 ############################################
 #            Main Program                  #
 ############################################
+RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
+. "${RELATIVE_DIR_PATH}/javaConfig.bash"
 
 if [[ -z "$1" ]]; then
     echo "usage: $0 <MONGODB_URI>"
@@ -34,10 +36,6 @@ if ! which git ; then
 fi
 
 cd src
-
-RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
-
 ./gradlew -version
 
 echo "Running tests..."