diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index 3c06acb61..501b2b737 100644 --- 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 index 58aa5df79..1aeb89a6c 100644 --- 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 index f9788c852..6f8237aac 100644 --- 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/integ-test/src/integration/scala/org/opensearch/flint/core/aws/AWSOpenSearchAccessTestSuite.scala b/integ-test/src/aws-integration/scala/org/opensearch/flint/core/aws/AWSOpenSearchAccessTestSuite.scala similarity index 100% rename from integ-test/src/integration/scala/org/opensearch/flint/core/aws/AWSOpenSearchAccessTestSuite.scala rename to integ-test/src/aws-integration/scala/org/opensearch/flint/core/aws/AWSOpenSearchAccessTestSuite.scala diff --git a/integ-test/src/integration/scala/org/opensearch/flint/core/aws/AWSOpenSearchSuite.scala b/integ-test/src/aws-integration/scala/org/opensearch/flint/core/aws/AWSOpenSearchSuite.scala similarity index 100% rename from integ-test/src/integration/scala/org/opensearch/flint/core/aws/AWSOpenSearchSuite.scala rename to integ-test/src/aws-integration/scala/org/opensearch/flint/core/aws/AWSOpenSearchSuite.scala diff --git a/integ-test/src/integration/scala/org/opensearch/flint/spark/aws/AWSEmrServerlessAccessTestSuite.scala b/integ-test/src/aws-integration/scala/org/opensearch/flint/spark/aws/AWSEmrServerlessAccessTestSuite.scala similarity index 100% rename from integ-test/src/integration/scala/org/opensearch/flint/spark/aws/AWSEmrServerlessAccessTestSuite.scala rename to integ-test/src/aws-integration/scala/org/opensearch/flint/spark/aws/AWSEmrServerlessAccessTestSuite.scala diff --git a/integ-test/src/test/java/org/opensearch/testcontainers/OpenSearchContainer.java b/integ-test/src/integration/java/org/opensearch/testcontainers/OpenSearchContainer.java similarity index 100% rename from integ-test/src/test/java/org/opensearch/testcontainers/OpenSearchContainer.java rename to integ-test/src/integration/java/org/opensearch/testcontainers/OpenSearchContainer.java diff --git a/integ-test/src/test/scala/org/apache/spark/FlintDataSourceV2ITSuite.scala b/integ-test/src/integration/scala/org/apache/spark/FlintDataSourceV2ITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/apache/spark/FlintDataSourceV2ITSuite.scala rename to integ-test/src/integration/scala/org/apache/spark/FlintDataSourceV2ITSuite.scala diff --git a/integ-test/src/test/scala/org/apache/spark/opensearch/catalog/OpenSearchCatalogITSuite.scala b/integ-test/src/integration/scala/org/apache/spark/opensearch/catalog/OpenSearchCatalogITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/apache/spark/opensearch/catalog/OpenSearchCatalogITSuite.scala rename to integ-test/src/integration/scala/org/apache/spark/opensearch/catalog/OpenSearchCatalogITSuite.scala diff --git a/integ-test/src/test/scala/org/apache/spark/opensearch/table/OpenSearchCatalogSuite.scala b/integ-test/src/integration/scala/org/apache/spark/opensearch/table/OpenSearchCatalogSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/apache/spark/opensearch/table/OpenSearchCatalogSuite.scala rename to integ-test/src/integration/scala/org/apache/spark/opensearch/table/OpenSearchCatalogSuite.scala diff --git a/integ-test/src/test/scala/org/apache/spark/opensearch/table/OpenSearchTableITSuite.scala b/integ-test/src/integration/scala/org/apache/spark/opensearch/table/OpenSearchTableITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/apache/spark/opensearch/table/OpenSearchTableITSuite.scala rename to integ-test/src/integration/scala/org/apache/spark/opensearch/table/OpenSearchTableITSuite.scala diff --git a/integ-test/src/test/scala/org/apache/spark/sql/FlintJobITSuite.scala b/integ-test/src/integration/scala/org/apache/spark/sql/FlintJobITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/apache/spark/sql/FlintJobITSuite.scala rename to integ-test/src/integration/scala/org/apache/spark/sql/FlintJobITSuite.scala diff --git a/integ-test/src/test/scala/org/apache/spark/sql/FlintREPLITSuite.scala b/integ-test/src/integration/scala/org/apache/spark/sql/FlintREPLITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/apache/spark/sql/FlintREPLITSuite.scala rename to integ-test/src/integration/scala/org/apache/spark/sql/FlintREPLITSuite.scala diff --git a/integ-test/src/test/scala/org/apache/spark/sql/JobTest.scala b/integ-test/src/integration/scala/org/apache/spark/sql/JobTest.scala similarity index 100% rename from integ-test/src/test/scala/org/apache/spark/sql/JobTest.scala rename to integ-test/src/integration/scala/org/apache/spark/sql/JobTest.scala diff --git a/integ-test/src/test/scala/org/apache/spark/sql/REPLResult.scala b/integ-test/src/integration/scala/org/apache/spark/sql/REPLResult.scala similarity index 100% rename from integ-test/src/test/scala/org/apache/spark/sql/REPLResult.scala rename to integ-test/src/integration/scala/org/apache/spark/sql/REPLResult.scala diff --git a/integ-test/src/test/scala/org/apache/spark/sql/SparkHiveSupportSuite.scala b/integ-test/src/integration/scala/org/apache/spark/sql/SparkHiveSupportSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/apache/spark/sql/SparkHiveSupportSuite.scala rename to integ-test/src/integration/scala/org/apache/spark/sql/SparkHiveSupportSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/OpenSearchSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/OpenSearchSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/OpenSearchSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/OpenSearchSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/OpenSearchTransactionSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/OpenSearchTransactionSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/OpenSearchTransactionSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/OpenSearchTransactionSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/core/FlintMetadataLogITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/core/FlintMetadataLogITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/core/FlintMetadataLogITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/core/FlintMetadataLogITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/core/FlintOpenSearchClientSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/core/FlintOpenSearchClientSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/core/FlintOpenSearchClientSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/core/FlintOpenSearchClientSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/core/FlintTransactionITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/core/FlintTransactionITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/core/FlintTransactionITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/core/FlintTransactionITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/core/OpenSearchUpdaterSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/core/OpenSearchUpdaterSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/core/OpenSearchUpdaterSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/core/OpenSearchUpdaterSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkCoveringIndexITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkCoveringIndexITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkCoveringIndexITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkCoveringIndexITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkCoveringIndexSqlITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkCoveringIndexSqlITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkCoveringIndexSqlITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkCoveringIndexSqlITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexJobITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexJobITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexJobITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexJobITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexJobSqlITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexJobSqlITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexJobSqlITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexJobSqlITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexMonitorITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexMonitorITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexMonitorITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexMonitorITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexNameITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexNameITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexNameITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexNameITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexSqlITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexSqlITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexSqlITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexSqlITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexValidationITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexValidationITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkIndexValidationITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkIndexValidationITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkMaterializedViewITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkMaterializedViewITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkMaterializedViewITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkMaterializedViewITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkMaterializedViewSqlITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkMaterializedViewSqlITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkMaterializedViewSqlITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkMaterializedViewSqlITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkSkippingIndexITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkSkippingIndexITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkSkippingIndexITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkSkippingIndexITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkSkippingIndexSqlITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkSkippingIndexSqlITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkSkippingIndexSqlITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkSkippingIndexSqlITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkTransactionITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkTransactionITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkTransactionITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkTransactionITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkUpdateIndexITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkUpdateIndexITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkUpdateIndexITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkUpdateIndexITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkWindowingFunctionITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkWindowingFunctionITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkWindowingFunctionITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkWindowingFunctionITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/LogicalPlanTestUtils.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/LogicalPlanTestUtils.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/LogicalPlanTestUtils.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/LogicalPlanTestUtils.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergCoveringIndexITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergCoveringIndexITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergCoveringIndexITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergCoveringIndexITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergMaterializedViewITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergMaterializedViewITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergMaterializedViewITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergMaterializedViewITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergSkippingIndexITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergSkippingIndexITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergSkippingIndexITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergSkippingIndexITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/iceberg/FlintSparkIcebergSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintPPLSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintPPLSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintPPLSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintPPLSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLAggregationWithSpanITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLAggregationWithSpanITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLAggregationWithSpanITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLAggregationWithSpanITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLAggregationsITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLAggregationsITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLAggregationsITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLAggregationsITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLBasicITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLBasicITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLBasicITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLBasicITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLBuiltinFunctionITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLBuiltinFunctionITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLBuiltinFunctionITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLBuiltinFunctionITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLCorrelationITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLCorrelationITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLCorrelationITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLCorrelationITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLEvalITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLEvalITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLEvalITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLEvalITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLFiltersITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLFiltersITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLFiltersITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLFiltersITSuite.scala diff --git a/integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLTimeWindowITSuite.scala b/integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLTimeWindowITSuite.scala similarity index 100% rename from integ-test/src/test/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLTimeWindowITSuite.scala rename to integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLTimeWindowITSuite.scala