Skip to content

Commit ce2aa41

Browse files
committed
Enable K8s integration tests for Java 17 with SBT.
1 parent c497abc commit ce2aa41

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

project/SparkBuild.scala

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -639,13 +639,19 @@ object KubernetesIntegrationTests {
639639
if (shouldBuildImage) {
640640
val dockerTool = s"$sparkHome/bin/docker-image-tool.sh"
641641
val bindingsDir = s"$sparkHome/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings"
642+
val dockerFile = sys.props.get("spark.kubernetes.test.dockerFile")
643+
val javaImageTag = sys.props.getOrElse("spark.kubernetes.test.javaImageTag", "8-jre-slim")
644+
val extraOptions = if (dockerFile.isDefined) {
645+
Seq("-f", s"${dockerFile.get}")
646+
} else {
647+
Seq("-b", s"java_image_tag=$javaImageTag")
648+
}
642649
val cmd = Seq(dockerTool, "-m",
643650
"-t", imageTag.value,
644651
"-p", s"$bindingsDir/python/Dockerfile",
645-
"-R", s"$bindingsDir/R/Dockerfile",
646-
"-b", s"java_image_tag=${sys.env.getOrElse("JAVA_IMAGE_TAG", "8-jre-slim")}",
652+
"-R", s"$bindingsDir/R/Dockerfile") ++
653+
extraOptions :+
647654
"build"
648-
)
649655
val ec = Process(cmd).!
650656
if (ec != 0) {
651657
throw new IllegalStateException(s"Process '${cmd.mkString(" ")}' exited with $ec.")

0 commit comments

Comments
 (0)