Fix Spark 3.4 Docker image building (#5665)

h2oai · Oct 10, 2023 · c4e1d48 · c4e1d48
1 parent 13b5031
commit c4e1d48
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/bin/build-kubernetes-images.sh b/bin/build-kubernetes-images.sh
@@ -3,9 +3,10 @@
 if [[ "$#" -ne 1 ]] || [[ "$1" != "scala" && "$1" != "python" && "$1" != "r"  && "$1" != "external-backend" ]]; then
   echo "This script expects exactly one argument which specifies type of image to be build."
   echo "The possible values are: scala, r, python, external-backend"
-  exit -1
+  exit 1
 fi
 
+set -e # fail on error
 
 # Current dir
 TOPDIR=$(cd "$(dirname "$0")/.." || exit; pwd)

diff --git a/ci/build.gradle b/ci/build.gradle
@@ -79,6 +79,9 @@ task createDockerfile(type: Dockerfile, dependsOn: copyFiles) {
     if (version.startsWith("3.0") || version.startsWith("3.1")) {
       runCommand "sed -i 's/\\(apt-key[^)]*\\)/apt-key adv --keyserver keyserver.ubuntu.com --recv-key '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7'/g' ${sparkPath}/kubernetes/dockerfiles/spark/bindings/R/Dockerfile"
     }
+    if (version > "3.4") { //downgrade back to openjdk as we do not support JDK 17 (yet)
+      runCommand "sed -i 's/eclipse-temurin/openjdk/g' ${sparkPath}/kubernetes/dockerfiles/spark/Dockerfile"
+    }
     def first = version.split("\\.")[0]
     def second = version.split("\\.")[1]
     environmentVariable("SPARK_HOME_${first}_${second}", sparkPath)

diff --git a/gradle.properties b/gradle.properties
@@ -36,4 +36,4 @@ databricksTestSinceSpark=2.4
 spotlessModern=true
 testH2OBranch=rel-3.42.0
 makeBooklet=false
-testingBaseImage="harbor.h2o.ai/opsh2oai/h2o-3-hadoop-cdh-6.3:84"
+testingBaseImage=harbor.h2o.ai/opsh2oai/h2o-3-hadoop-cdh-6.3:84