Skip to content

[SPARK-37529][K8S][TESTS] Support K8s integration tests for Java 17 #34790

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

Closed
sarutak wants to merge 2 commits into from
Closed

[SPARK-37529][K8S][TESTS] Support K8s integration tests for Java 17 #34790

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
c497abc
Enable K8s integration tests for Java 17 with Maven.
sarutak Dec 3, 2021
ce2aa41
Enable K8s integration tests for Java 17 with SBT.
sarutak Dec 3, 2021
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
12 changes: 9 additions & 3 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,13 +639,19 @@ object KubernetesIntegrationTests {
if (shouldBuildImage) {
val dockerTool = s"$sparkHome/bin/docker-image-tool.sh"
val bindingsDir = s"$sparkHome/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings"
val dockerFile = sys.props.get("spark.kubernetes.test.dockerFile")
val javaImageTag = sys.props.getOrElse("spark.kubernetes.test.javaImageTag", "8-jre-slim")
val extraOptions = if (dockerFile.isDefined) {
Seq("-f", s"${dockerFile.get}")
} else {
Seq("-b", s"java_image_tag=$javaImageTag")
}
val cmd = Seq(dockerTool, "-m",
"-t", imageTag.value,
"-p", s"$bindingsDir/python/Dockerfile",
"-R", s"$bindingsDir/R/Dockerfile",
"-b", s"java_image_tag=${sys.env.getOrElse("JAVA_IMAGE_TAG", "8-jre-slim")}",
"-R", s"$bindingsDir/R/Dockerfile") ++
extraOptions :+
"build"
)
val ec = Process(cmd).!
if (ec != 0) {
throw new IllegalStateException(s"Process '${cmd.mkString(" ")}' exited with $ec.")
Expand Down
4 changes: 4 additions & 0 deletions 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,6 +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>N/A</spark.kubernetes.test.dockerFile>

<test.exclude.tags></test.exclude.tags>
<test.include.tags></test.include.tags>
Expand Down Expand Up @@ -112,6 +113,9 @@
<argument>--spark-tgz</argument>
<argument>${spark.kubernetes.test.sparkTgz}</argument>

<argument>--docker-file</argument>
<argument>${spark.kubernetes.test.dockerFile}</argument>

<argument>--test-exclude-tags</argument>
<argument>"${test.exclude.tags}"</argument>
</arguments>
Expand Down
13 changes: 11 additions & 2 deletions 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 @@ -26,6 +26,7 @@ IMAGE_TAG="N/A"
JAVA_IMAGE_TAG="8-jre-slim"
SPARK_TGZ="N/A"
MVN="$TEST_ROOT_DIR/build/mvn"
DOCKER_FILE="N/A"
EXCLUDE_TAGS=""

# Parse arguments
Expand Down Expand Up @@ -59,6 +60,10 @@ while (( "$#" )); do
SPARK_TGZ="$2"
shift
;;
--docker-file)
Copy link
Member

@dongjoon-hyun dongjoon-hyun Dec 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to update resource-managers/kubernetes/integration-tests/README.md?

DOCKER_FILE="$2"
shift
;;
--test-exclude-tags)
EXCLUDE_TAGS="$2"
shift
Expand Down Expand Up @@ -97,8 +102,12 @@ then
IMAGE_TAG=${VERSION}_$(uuidgen)
cd $SPARK_INPUT_DIR

# OpenJDK base-image tag (e.g. 8-jre-slim, 11-jre-slim)
JAVA_IMAGE_TAG_BUILD_ARG="-b java_image_tag=$JAVA_IMAGE_TAG"
if [[ $DOCKER_FILE == "N/A" ]]; 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"
fi

# Build PySpark image
LANGUAGE_BINDING_BUILD_ARGS="-p $DOCKER_FILE_BASE_PATH/bindings/python/Dockerfile"
Expand Down