Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SPARK-38302][K8S][TESTS] Use Java 17 in K8S IT in case of spark-tgz option #35627

Closed
wants to merge 2 commits into from
Closed

[SPARK-38302][K8S][TESTS] Use Java 17 in K8S IT in case of spark-tgz option #35627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3855d8d
[SPARK-38302][K8S][TESTS] Use Java 17 in K8S integration tests when s…
dcoliversun Feb 23, 2022
2e85e70
allow docker-file to be absolute path
dcoliversun Feb 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ object KubernetesIntegrationTests {
val bindingsDir = s"$sparkHome/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings"
val javaImageTag = sys.props.get("spark.kubernetes.test.javaImageTag")
val dockerFile = sys.props.getOrElse("spark.kubernetes.test.dockerFile",
"resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile.java17")
s"$sparkHome/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile.java17")
val extraOptions = if (javaImageTag.isDefined) {
Seq("-b", s"java_image_tag=$javaImageTag")
} else {
Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<spark.kubernetes.test.master></spark.kubernetes.test.master>
<spark.kubernetes.test.namespace></spark.kubernetes.test.namespace>
<spark.kubernetes.test.serviceAccountName></spark.kubernetes.test.serviceAccountName>
<spark.kubernetes.test.dockerFile>resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile.java17</spark.kubernetes.test.dockerFile>
<spark.kubernetes.test.dockerFile>Dockerfile.java17</spark.kubernetes.test.dockerFile>

<test.exclude.tags></test.exclude.tags>
<test.include.tags></test.include.tags>
Expand Down
6 changes: 5 additions & 1 deletion resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,11 @@ then
# OpenJDK base-image tag (e.g. 8-jre-slim, 11-jre-slim)
JAVA_IMAGE_TAG_BUILD_ARG="-b java_image_tag=$JAVA_IMAGE_TAG"
else
JAVA_IMAGE_TAG_BUILD_ARG="-f $DOCKER_FILE"
if [[ $DOCKER_FILE = /* ]]; then
dcoliversun marked this conversation as resolved.
Show resolved Hide resolved
JAVA_IMAGE_TAG_BUILD_ARG="-f $DOCKER_FILE"
else
JAVA_IMAGE_TAG_BUILD_ARG="-f $DOCKER_FILE_BASE_PATH/$DOCKER_FILE"
fi
fi

# Build PySpark image
Expand Down