From 9dd5bc9f85f57bda2df85e15e5bace4e08670bae Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Mon, 28 Jun 2021 22:34:34 -0700 Subject: [PATCH 1/2] [SPARK-35483][TESTS] Add sql dependency to docker_integration_tests --- dev/sparktestsupport/modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py index 5d28b9ee73374..09258c9362d3f 100644 --- a/dev/sparktestsupport/modules.py +++ b/dev/sparktestsupport/modules.py @@ -769,7 +769,7 @@ def __hash__(self): docker_integration_tests = Module( name="docker-integration-tests", - dependencies=[], + dependencies=[sql], build_profile_flags=["-Pdocker-integration-tests"], source_file_regexes=["external/docker-integration-tests"], sbt_test_goals=["docker-integration-tests/test"], From 3bd4962c8fe0f2ad4dc02f74613ea874d1862ad9 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Mon, 28 Jun 2021 22:45:17 -0700 Subject: [PATCH 2/2] Set ENABLE_DOCKER_INTEGRATION_TESTS for catalyst and sql module change --- dev/sparktestsupport/modules.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py index 09258c9362d3f..2ba3390ea877a 100644 --- a/dev/sparktestsupport/modules.py +++ b/dev/sparktestsupport/modules.py @@ -177,6 +177,9 @@ def __hash__(self): sbt_test_goals=[ "catalyst/test", ], + environ=None if "GITHUB_ACTIONS" not in os.environ else { + "ENABLE_DOCKER_INTEGRATION_TESTS": "1" + }, ) sql = Module( @@ -188,6 +191,9 @@ def __hash__(self): sbt_test_goals=[ "sql/test", ], + environ=None if "GITHUB_ACTIONS" not in os.environ else { + "ENABLE_DOCKER_INTEGRATION_TESTS": "1" + }, ) hive = Module(