Reorganize IT directory to prevent unintentional execution from UT (o…

…pensearch-project#501) * Refactor IT and UT task and remove UT in CI Signed-off-by: Chen Dai <[email protected]> * Update dev guide Signed-off-by: Chen Dai <[email protected]> * Update doc with IT dependency Signed-off-by: Chen Dai <[email protected]> --------- Signed-off-by: Chen Dai <[email protected]>
YANG-DB · Aug 6, 2024 · a91b3ef · a91b3ef
1 parent 7b52d81
commit a91b3ef
Show file tree

Hide file tree

Showing 52 changed files with 25 additions and 11 deletions.
diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml
@@ -23,10 +23,7 @@ jobs:
           java-version: 11
 
       - name: Integ Test
-        run: sbt integtest/test
-
-      - name: Unit Test
-        run: sbt test
+        run: sbt integtest/integration
 
       - name: Style check
         run: sbt scalafmtCheckAll
diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
@@ -6,11 +6,16 @@ If you want to package the single jar for, you can do so by running the followin
 sbt assembly
 ```
 
+## Unit Test
+To execute the unit tests, run the following command:
+```
+sbt test
+```
+
 ## Integration Test
-The integration test is defined in the integ-test directory of the project. If you want to run the integration test for the project, you 
-can do so by running the following command:
+The integration test is defined in the `integration` directory of the project. The integration tests will automatically trigger unit tests and will only run if all unit tests pass. If you want to run the integration test for the project, you can do so by running the following command:
 ```
-sbt integtest/test
+sbt integtest/integration
 ```
 If you get integration test failures with error message "Previous attempts to find a Docker environment failed" in macOS, fix the issue by following the checklist:
 1. Check you've installed Docker in your dev host. If not, install Docker first.
@@ -19,7 +24,7 @@ If you get integration test failures with error message "Previous attempts to fi
 4. If you use Docker Desktop, as an alternative of `3`, check mark the "Allow the default Docker socket to be used (requires password)" in advanced settings of Docker Desktop.
 
 ### AWS Integration Test
-The integration folder contains tests for cloud server providers. For instance, test against AWS OpenSearch domain, configure the following settings. The client will use the default credential provider to access the AWS OpenSearch domain.
+The `aws-integration` folder contains tests for cloud server providers. For instance, test against AWS OpenSearch domain, configure the following settings. The client will use the default credential provider to access the AWS OpenSearch domain.
 ```
 export AWS_OPENSEARCH_HOST=search-xxx.us-west-2.on.aws
 export AWS_REGION=us-west-2
@@ -29,9 +34,9 @@ export AWS_S3_CODE_BUCKET=xxx
 export AWS_S3_CODE_PREFIX=xxx
 export AWS_OPENSEARCH_RESULT_INDEX=query_execution_result_glue
 ```
-And run the 
+And run the following command:
 ```
-sbt integtest/integration
+sbt integtest/awsIntegration
 
 [info] AWSOpenSearchAccessTestSuite:
 [info] - should Create Pit on AWS OpenSearch

diff --git a/build.sbt b/build.sbt
@@ -217,10 +217,12 @@ lazy val flintSparkIntegration = (project in file("flint-spark-integration"))
     assembly / test := (Test / test).value)
 
 lazy val IntegrationTest = config("it") extend Test
+lazy val AwsIntegrationTest = config("aws-it") extend Test
 
 // Test assembly package with integration test.
 lazy val integtest = (project in file("integ-test"))
   .dependsOn(flintCommons % "test->test", flintSparkIntegration % "test->test", pplSparkIntegration % "test->test", sparkSqlApplication % "test->test")
+  .configs(IntegrationTest, AwsIntegrationTest)
   .settings(
     commonSettings,
     name := "integ-test",
@@ -231,10 +233,17 @@ lazy val integtest = (project in file("integ-test"))
       s"-DpplJar=${(pplSparkIntegration / assembly).value.getAbsolutePath}",
     ),
     inConfig(IntegrationTest)(Defaults.testSettings ++ Seq(
+      IntegrationTest / javaSource := baseDirectory.value / "src/integration/java",
       IntegrationTest / scalaSource := baseDirectory.value / "src/integration/scala",
       IntegrationTest / parallelExecution := false,
       IntegrationTest / fork := true,
-      )),
+    )),
+    inConfig(AwsIntegrationTest)(Defaults.testSettings ++ Seq(
+      AwsIntegrationTest / javaSource := baseDirectory.value / "src/aws-integration/java",
+      AwsIntegrationTest / scalaSource := baseDirectory.value / "src/aws-integration/scala",
+      AwsIntegrationTest / parallelExecution := false,
+      AwsIntegrationTest / fork := true,
+    )),
     libraryDependencies ++= Seq(
       "com.amazonaws" % "aws-java-sdk" % "1.12.397" % "provided"
         exclude ("com.fasterxml.jackson.core", "jackson-databind"),
@@ -249,9 +258,12 @@ lazy val integtest = (project in file("integ-test"))
       (sparkSqlApplication / assembly).value
     ),
     IntegrationTest / dependencyClasspath ++= (Test / dependencyClasspath).value,
+    AwsIntegrationTest / dependencyClasspath ++= (Test / dependencyClasspath).value,
     integration := (IntegrationTest / test).value,
+    awsIntegration := (AwsIntegrationTest / test).value
   )
 lazy val integration = taskKey[Unit]("Run integration tests")
+lazy val awsIntegration = taskKey[Unit]("Run AWS integration tests")
 
 lazy val standaloneCosmetic = project
   .settings(

diff --git a/...re/aws/AWSOpenSearchAccessTestSuite.scala → ...re/aws/AWSOpenSearchAccessTestSuite.scala b/...re/aws/AWSOpenSearchAccessTestSuite.scala → ...re/aws/AWSOpenSearchAccessTestSuite.scala
diff --git a/...h/flint/core/aws/AWSOpenSearchSuite.scala → ...h/flint/core/aws/AWSOpenSearchSuite.scala b/...h/flint/core/aws/AWSOpenSearchSuite.scala → ...h/flint/core/aws/AWSOpenSearchSuite.scala
diff --git a/...aws/AWSEmrServerlessAccessTestSuite.scala → ...aws/AWSEmrServerlessAccessTestSuite.scala b/...aws/AWSEmrServerlessAccessTestSuite.scala → ...aws/AWSEmrServerlessAccessTestSuite.scala
diff --git a/...h/testcontainers/OpenSearchContainer.java → ...h/testcontainers/OpenSearchContainer.java b/...h/testcontainers/OpenSearchContainer.java → ...h/testcontainers/OpenSearchContainer.java
diff --git a/...ache/spark/FlintDataSourceV2ITSuite.scala → ...ache/spark/FlintDataSourceV2ITSuite.scala b/...ache/spark/FlintDataSourceV2ITSuite.scala → ...ache/spark/FlintDataSourceV2ITSuite.scala
diff --git a/...ch/catalog/OpenSearchCatalogITSuite.scala → ...ch/catalog/OpenSearchCatalogITSuite.scala b/...ch/catalog/OpenSearchCatalogITSuite.scala → ...ch/catalog/OpenSearchCatalogITSuite.scala
diff --git a/...search/table/OpenSearchCatalogSuite.scala → ...search/table/OpenSearchCatalogSuite.scala b/...search/table/OpenSearchCatalogSuite.scala → ...search/table/OpenSearchCatalogSuite.scala
diff --git a/...search/table/OpenSearchTableITSuite.scala → ...search/table/OpenSearchTableITSuite.scala b/...search/table/OpenSearchTableITSuite.scala → ...search/table/OpenSearchTableITSuite.scala
diff --git a/...rg/apache/spark/sql/FlintJobITSuite.scala → ...rg/apache/spark/sql/FlintJobITSuite.scala b/...rg/apache/spark/sql/FlintJobITSuite.scala → ...rg/apache/spark/sql/FlintJobITSuite.scala
diff --git a/...g/apache/spark/sql/FlintREPLITSuite.scala → ...g/apache/spark/sql/FlintREPLITSuite.scala b/...g/apache/spark/sql/FlintREPLITSuite.scala → ...g/apache/spark/sql/FlintREPLITSuite.scala
diff --git a/.../scala/org/apache/spark/sql/JobTest.scala → .../scala/org/apache/spark/sql/JobTest.scala b/.../scala/org/apache/spark/sql/JobTest.scala → .../scala/org/apache/spark/sql/JobTest.scala
diff --git a/...ala/org/apache/spark/sql/REPLResult.scala → ...ala/org/apache/spark/sql/REPLResult.scala b/...ala/org/apache/spark/sql/REPLResult.scala → ...ala/org/apache/spark/sql/REPLResult.scala
diff --git a/...che/spark/sql/SparkHiveSupportSuite.scala → ...che/spark/sql/SparkHiveSupportSuite.scala b/...che/spark/sql/SparkHiveSupportSuite.scala → ...che/spark/sql/SparkHiveSupportSuite.scala
diff --git a/...rg/opensearch/flint/OpenSearchSuite.scala → ...rg/opensearch/flint/OpenSearchSuite.scala b/...rg/opensearch/flint/OpenSearchSuite.scala → ...rg/opensearch/flint/OpenSearchSuite.scala
diff --git a/...ch/flint/OpenSearchTransactionSuite.scala → ...ch/flint/OpenSearchTransactionSuite.scala b/...ch/flint/OpenSearchTransactionSuite.scala → ...ch/flint/OpenSearchTransactionSuite.scala
diff --git a/.../flint/core/FlintMetadataLogITSuite.scala → .../flint/core/FlintMetadataLogITSuite.scala b/.../flint/core/FlintMetadataLogITSuite.scala → .../flint/core/FlintMetadataLogITSuite.scala
diff --git a/...int/core/FlintOpenSearchClientSuite.scala → ...int/core/FlintOpenSearchClientSuite.scala b/...int/core/FlintOpenSearchClientSuite.scala → ...int/core/FlintOpenSearchClientSuite.scala
diff --git a/.../flint/core/FlintTransactionITSuite.scala → .../flint/core/FlintTransactionITSuite.scala b/.../flint/core/FlintTransactionITSuite.scala → .../flint/core/FlintTransactionITSuite.scala
diff --git a/...h/flint/core/OpenSearchUpdaterSuite.scala → ...h/flint/core/OpenSearchUpdaterSuite.scala b/...h/flint/core/OpenSearchUpdaterSuite.scala → ...h/flint/core/OpenSearchUpdaterSuite.scala
diff --git a/...park/FlintSparkCoveringIndexITSuite.scala → ...park/FlintSparkCoveringIndexITSuite.scala b/...park/FlintSparkCoveringIndexITSuite.scala → ...park/FlintSparkCoveringIndexITSuite.scala
diff --git a/...k/FlintSparkCoveringIndexSqlITSuite.scala → ...k/FlintSparkCoveringIndexSqlITSuite.scala b/...k/FlintSparkCoveringIndexSqlITSuite.scala → ...k/FlintSparkCoveringIndexSqlITSuite.scala
diff --git a/...int/spark/FlintSparkIndexJobITSuite.scala → ...int/spark/FlintSparkIndexJobITSuite.scala b/...int/spark/FlintSparkIndexJobITSuite.scala → ...int/spark/FlintSparkIndexJobITSuite.scala
diff --git a/.../spark/FlintSparkIndexJobSqlITSuite.scala → .../spark/FlintSparkIndexJobSqlITSuite.scala b/.../spark/FlintSparkIndexJobSqlITSuite.scala → .../spark/FlintSparkIndexJobSqlITSuite.scala
diff --git a/...spark/FlintSparkIndexMonitorITSuite.scala → ...spark/FlintSparkIndexMonitorITSuite.scala b/...spark/FlintSparkIndexMonitorITSuite.scala → ...spark/FlintSparkIndexMonitorITSuite.scala
diff --git a/...nt/spark/FlintSparkIndexNameITSuite.scala → ...nt/spark/FlintSparkIndexNameITSuite.scala b/...nt/spark/FlintSparkIndexNameITSuite.scala → ...nt/spark/FlintSparkIndexNameITSuite.scala
diff --git a/...int/spark/FlintSparkIndexSqlITSuite.scala → ...int/spark/FlintSparkIndexSqlITSuite.scala b/...int/spark/FlintSparkIndexSqlITSuite.scala → ...int/spark/FlintSparkIndexSqlITSuite.scala
diff --git a/...rk/FlintSparkIndexValidationITSuite.scala → ...rk/FlintSparkIndexValidationITSuite.scala b/...rk/FlintSparkIndexValidationITSuite.scala → ...rk/FlintSparkIndexValidationITSuite.scala
diff --git a/...k/FlintSparkMaterializedViewITSuite.scala → ...k/FlintSparkMaterializedViewITSuite.scala b/...k/FlintSparkMaterializedViewITSuite.scala → ...k/FlintSparkMaterializedViewITSuite.scala
diff --git a/...lintSparkMaterializedViewSqlITSuite.scala → ...lintSparkMaterializedViewSqlITSuite.scala b/...lintSparkMaterializedViewSqlITSuite.scala → ...lintSparkMaterializedViewSqlITSuite.scala
diff --git a/...park/FlintSparkSkippingIndexITSuite.scala → ...park/FlintSparkSkippingIndexITSuite.scala b/...park/FlintSparkSkippingIndexITSuite.scala → ...park/FlintSparkSkippingIndexITSuite.scala
diff --git a/...k/FlintSparkSkippingIndexSqlITSuite.scala → ...k/FlintSparkSkippingIndexSqlITSuite.scala b/...k/FlintSparkSkippingIndexSqlITSuite.scala → ...k/FlintSparkSkippingIndexSqlITSuite.scala
diff --git a/...nsearch/flint/spark/FlintSparkSuite.scala → ...nsearch/flint/spark/FlintSparkSuite.scala b/...nsearch/flint/spark/FlintSparkSuite.scala → ...nsearch/flint/spark/FlintSparkSuite.scala
diff --git a/.../spark/FlintSparkTransactionITSuite.scala → .../spark/FlintSparkTransactionITSuite.scala b/.../spark/FlintSparkTransactionITSuite.scala → .../spark/FlintSparkTransactionITSuite.scala
diff --git a/.../spark/FlintSparkUpdateIndexITSuite.scala → .../spark/FlintSparkUpdateIndexITSuite.scala b/.../spark/FlintSparkUpdateIndexITSuite.scala → .../spark/FlintSparkUpdateIndexITSuite.scala
diff --git a/.../FlintSparkWindowingFunctionITSuite.scala → .../FlintSparkWindowingFunctionITSuite.scala b/.../FlintSparkWindowingFunctionITSuite.scala → .../FlintSparkWindowingFunctionITSuite.scala
diff --git a/...ch/flint/spark/LogicalPlanTestUtils.scala → ...ch/flint/spark/LogicalPlanTestUtils.scala b/...ch/flint/spark/LogicalPlanTestUtils.scala → ...ch/flint/spark/LogicalPlanTestUtils.scala
diff --git a/...intSparkIcebergCoveringIndexITSuite.scala → ...intSparkIcebergCoveringIndexITSuite.scala b/...intSparkIcebergCoveringIndexITSuite.scala → ...intSparkIcebergCoveringIndexITSuite.scala
diff --git a/...SparkIcebergMaterializedViewITSuite.scala → ...SparkIcebergMaterializedViewITSuite.scala b/...SparkIcebergMaterializedViewITSuite.scala → ...SparkIcebergMaterializedViewITSuite.scala
diff --git a/...intSparkIcebergSkippingIndexITSuite.scala → ...intSparkIcebergSkippingIndexITSuite.scala b/...intSparkIcebergSkippingIndexITSuite.scala → ...intSparkIcebergSkippingIndexITSuite.scala
diff --git a/...park/iceberg/FlintSparkIcebergSuite.scala → ...park/iceberg/FlintSparkIcebergSuite.scala b/...park/iceberg/FlintSparkIcebergSuite.scala → ...park/iceberg/FlintSparkIcebergSuite.scala
diff --git a/...earch/flint/spark/ppl/FlintPPLSuite.scala → ...earch/flint/spark/ppl/FlintPPLSuite.scala b/...earch/flint/spark/ppl/FlintPPLSuite.scala → ...earch/flint/spark/ppl/FlintPPLSuite.scala
diff --git a/...tSparkPPLAggregationWithSpanITSuite.scala → ...tSparkPPLAggregationWithSpanITSuite.scala b/...tSparkPPLAggregationWithSpanITSuite.scala → ...tSparkPPLAggregationWithSpanITSuite.scala
diff --git a/...pl/FlintSparkPPLAggregationsITSuite.scala → ...pl/FlintSparkPPLAggregationsITSuite.scala b/...pl/FlintSparkPPLAggregationsITSuite.scala → ...pl/FlintSparkPPLAggregationsITSuite.scala
diff --git a/...spark/ppl/FlintSparkPPLBasicITSuite.scala → ...spark/ppl/FlintSparkPPLBasicITSuite.scala b/...spark/ppl/FlintSparkPPLBasicITSuite.scala → ...spark/ppl/FlintSparkPPLBasicITSuite.scala
diff --git a/...FlintSparkPPLBuiltinFunctionITSuite.scala → ...FlintSparkPPLBuiltinFunctionITSuite.scala b/...FlintSparkPPLBuiltinFunctionITSuite.scala → ...FlintSparkPPLBuiltinFunctionITSuite.scala
diff --git a/...ppl/FlintSparkPPLCorrelationITSuite.scala → ...ppl/FlintSparkPPLCorrelationITSuite.scala b/...ppl/FlintSparkPPLCorrelationITSuite.scala → ...ppl/FlintSparkPPLCorrelationITSuite.scala
diff --git a/.../spark/ppl/FlintSparkPPLEvalITSuite.scala → .../spark/ppl/FlintSparkPPLEvalITSuite.scala b/.../spark/ppl/FlintSparkPPLEvalITSuite.scala → .../spark/ppl/FlintSparkPPLEvalITSuite.scala
diff --git a/...ark/ppl/FlintSparkPPLFiltersITSuite.scala → ...ark/ppl/FlintSparkPPLFiltersITSuite.scala b/...ark/ppl/FlintSparkPPLFiltersITSuite.scala → ...ark/ppl/FlintSparkPPLFiltersITSuite.scala
diff --git a/.../ppl/FlintSparkPPLTimeWindowITSuite.scala → .../ppl/FlintSparkPPLTimeWindowITSuite.scala b/.../ppl/FlintSparkPPLTimeWindowITSuite.scala → .../ppl/FlintSparkPPLTimeWindowITSuite.scala