Skip to content

[SPARK-31780][K8S][TESTS] Add R test tag to exclude R K8s image building and test #28594

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
dongjoon-hyun wants to merge 2 commits into from
Closed

[SPARK-31780][K8S][TESTS] Add R test tag to exclude R K8s image building and test #28594

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
a26fb26
[SPARK-31780][K8S][TESTS] Add R test tag to exclude R K8s image build…
dongjoon-hyun May 20, 2020
0a37e82
fix
dongjoon-hyun May 21, 2020
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
3 changes: 3 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 @@ -121,6 +121,9 @@

<argument>--spark-tgz</argument>
<argument>${spark.kubernetes.test.sparkTgz}</argument>

<argument>--test-exclude-tags</argument>
<argument>"${test.exclude.tags}"</argument>
</arguments>
</configuration>
</execution>
Expand Down
10 changes: 9 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 @@ -26,6 +26,7 @@ IMAGE_TAG="N/A"
JAVA_IMAGE_TAG="8-jre-slim"
SPARK_TGZ="N/A"
MVN="$TEST_ROOT_DIR/build/mvn"
EXCLUDE_TAGS=""

# Parse arguments
while (( "$#" )); do
Expand Down Expand Up @@ -58,6 +59,10 @@ while (( "$#" )); do
SPARK_TGZ="$2"
shift
;;
--test-exclude-tags)
EXCLUDE_TAGS="$2"
shift
;;
*)
break
;;
Expand Down Expand Up @@ -99,7 +104,10 @@ then
LANGUAGE_BINDING_BUILD_ARGS="-p $DOCKER_FILE_BASE_PATH/bindings/python/Dockerfile"

# Build SparkR image
LANGUAGE_BINDING_BUILD_ARGS="$LANGUAGE_BINDING_BUILD_ARGS -R $DOCKER_FILE_BASE_PATH/bindings/R/Dockerfile"
tags=(${EXCLUDE_TAGS//,/ })
if [[ ! ${tags[@]} =~ "r" ]]; then
LANGUAGE_BINDING_BUILD_ARGS="$LANGUAGE_BINDING_BUILD_ARGS -R $DOCKER_FILE_BASE_PATH/bindings/R/Dockerfile"
fi

# Unset SPARK_HOME to let the docker-image-tool script detect SPARK_HOME. Otherwise, it cannot
# indicate the unpacked directory as its home. See SPARK-28550.
Expand Down
1 change: 1 addition & 0 deletions ...on-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ class KubernetesSuite extends SparkFunSuite

private[spark] object KubernetesSuite {
val k8sTestTag = Tag("k8s")
val rTestTag = Tag("r")
val MinikubeTag = Tag("minikube")
val SPARK_PI_MAIN_CLASS: String = "org.apache.spark.examples.SparkPi"
val SPARK_DFS_READ_WRITE_TEST = "org.apache.spark.examples.DFSReadWriteTest"
Expand Down
4 changes: 2 additions & 2 deletions ...ration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/RTestsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package org.apache.spark.deploy.k8s.integrationtest
private[spark] trait RTestsSuite { k8sSuite: KubernetesSuite =>

import RTestsSuite._
import KubernetesSuite.k8sTestTag
import KubernetesSuite.{k8sTestTag, rTestTag}

test("Run SparkR on simple dataframe.R example", k8sTestTag) {
test("Run SparkR on simple dataframe.R example", k8sTestTag, rTestTag) {
sparkAppConf.set("spark.kubernetes.container.image", rImage)
runSparkApplicationAndVerifyCompletion(
appResource = SPARK_R_DATAFRAME_TEST,
Expand Down