sarutak opened a new pull request #34628:
URL: https://github.com/apache/spark/pull/34628
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section
is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster
reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class
hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other
DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
This PR fixes an issue that the Java version installed on the container
image used by K8s integration tests are not configurable in case the tests are
launched by SBT.
`bin/docker-image-tool.sh` supports `-b java_image_tag=<java image tag>`
option to the Java version installed on the container image configurable.
But `project/SparkBuild.scala` doesn't provide the way to pass the option so
we can't change the Java version if the tests are launched by SBT.
To allow to change the version, this PR changes `project/SparkBuild.scala`
to recognized the environment variable `JAVA_IMAGE_TAG`, which is the same
manner that
`resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh`
does.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
The K8s integration tests should be launched by any supported Java versions.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as
the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes
- provide the console output, description and/or an example to show the
behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to
the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some
test cases that check the changes thoroughly including negative and positive
cases if possible.
If it was tested in a way different from regular unit tests, please clarify
how you tested step by step, ideally copy and paste-able, so that other
reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why
it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions
for the consistent environment, and the instructions could accord to:
https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
Confirmed that the Java version installed on the container image.
In case `JAVA_IMAGE_TAG` is not set:
```
# Run the integration tests to create the container image
$ build/sbt -Phive -Pkubernetes -Pkubernetes-integration-tests package
"kubernetes-integration-tests/test"
# Create and login the container.
docker run -it <image>:<tag> /bin/bash
# Confirm the version in the container.
185@4023f49aa0b0:/opt/spark/work-dir$ java -version
openjdk version "1.8.0_312"
OpenJDK Runtime Environment (build 1.8.0_312-b07)
OpenJDK 64-Bit Server VM (build 25.312-b07, mixed mode)
```
In case `JAVA_IMAGE_TAG` is set:
```
# Run the integration tests to create the container image
$ JAVA_IMAGE_TAG=11-jre-slim build/sbt -Phive -Pkubernetes
-Pkubernetes-integration-tests package "kubernetes-integration-tests/test"
# Create and login the container.
docker run -it <image>:<tag> /bin/bash
# Confirm the version in the container.
185@fdf2d9d5ee26:/opt/spark/work-dir$ java -version
openjdk version "11.0.13" 2021-10-19
OpenJDK Runtime Environment 18.9 (build 11.0.13+8)
OpenJDK 64-Bit Server VM 18.9 (build 11.0.13+8, mixed mode, sharing)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
