From e5cc9b9a36bb5365e3a75f28d51ee44b19f513e5 Mon Sep 17 00:00:00 2001 From: Ilan Filonenko Date: Sun, 19 Aug 2018 17:45:21 -0400 Subject: [PATCH 1/3] reintroduced sparkr integration tests --- .../spark/deploy/k8s/integrationtest/KubernetesSuite.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala index bc0bb20908254..f76a12a7baddf 100644 --- a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala +++ b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala @@ -40,8 +40,8 @@ import org.apache.spark.internal.config._ class KubernetesSuite extends SparkFunSuite with BeforeAndAfterAll with BeforeAndAfter with BasicTestsSuite with SecretsTestsSuite - with PythonTestsSuite with ClientModeTestsSuite with PodTemplateSuite with PVTestsSuite - with Logging with Eventually with Matchers { + with PythonTestsSuite with RTestsSuite with ClientModeTestsSuite with PodTemplateSuite + with PVTestsSuite with Logging with Eventually with Matchers { import KubernetesSuite._ From f7be6845eb8f1f2958fb6ce3541fe6e5015dd0c2 Mon Sep 17 00:00:00 2001 From: Ilan Filonenko Date: Sat, 12 Oct 2019 15:54:00 -0700 Subject: [PATCH 2/3] add sparkr building --- .../integration-tests/scripts/setup-integration-test-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh b/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh index 072730e97e778..2695b363c1656 100755 --- a/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh +++ b/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh @@ -86,7 +86,7 @@ then LANGUAGE_BINDING_BUILD_ARGS="-p $DOCKER_FILE_BASE_PATH/bindings/python/Dockerfile" # Build SparkR image -- disabled since this fails, re-enable as part of SPARK-25152 - # LANGUAGE_BINDING_BUILD_ARGS="$LANGUAGE_BINDING_BUILD_ARGS -R $DOCKER_FILE_BASE_PATH/bindings/R/Dockerfile" + LANGUAGE_BINDING_BUILD_ARGS="$LANGUAGE_BINDING_BUILD_ARGS -R $DOCKER_FILE_BASE_PATH/bindings/R/Dockerfile" # 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. From df2d3abcd774711c5e983fe71fc7f6de31af0c6b Mon Sep 17 00:00:00 2001 From: Ilan Filonenko Date: Sat, 12 Oct 2019 15:55:29 -0700 Subject: [PATCH 3/3] remove comment about it being disabled --- .../integration-tests/scripts/setup-integration-test-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh b/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh index 2695b363c1656..9e04b963fc40e 100755 --- a/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh +++ b/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh @@ -85,7 +85,7 @@ then # Build PySpark image LANGUAGE_BINDING_BUILD_ARGS="-p $DOCKER_FILE_BASE_PATH/bindings/python/Dockerfile" - # Build SparkR image -- disabled since this fails, re-enable as part of SPARK-25152 + # Build SparkR image LANGUAGE_BINDING_BUILD_ARGS="$LANGUAGE_BINDING_BUILD_ARGS -R $DOCKER_FILE_BASE_PATH/bindings/R/Dockerfile" # Unset SPARK_HOME to let the docker-image-tool script detect SPARK_HOME. Otherwise, it cannot