diff --git a/.github/workflows/backend-integration-test.yml b/.github/workflows/backend-integration-test.yml index 2ba80aec413..aa564ac8d59 100644 --- a/.github/workflows/backend-integration-test.yml +++ b/.github/workflows/backend-integration-test.yml @@ -96,7 +96,7 @@ jobs: - name: Backend Integration Test id: integrationTest run: > - ./gradlew test -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} -P${{ matrix.backend }} -PskipWebITs + ./gradlew test -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} -P${{ matrix.backend }} -PskipWebITs -PskipDockerTests=false -x :web:test -x :clients:client-python:test -x :flink-connector:test -x :spark-connector:test -x :spark-connector:spark-common:test -x :spark-connector:spark-3.3:test -x :spark-connector:spark-3.4:test -x :spark-connector:spark-3.5:test -x :spark-connector:spark-runtime-3.3:test -x :spark-connector:spark-runtime-3.4:test -x :spark-connector:spark-runtime-3.5:test diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f284f44f9c8..e6a22cf359b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,7 +96,7 @@ jobs: dev/ci/util_free_space.sh - name: Build with Gradle - run: ./gradlew build -PskipITs -PjdkVersion=${{ matrix.java-version }} -x :clients:client-python:build + run: ./gradlew build -PskipITs -PjdkVersion=${{ matrix.java-version }} -PskipDockerTests=false -x :clients:client-python:build - name: Upload unit tests report uses: actions/upload-artifact@v3 diff --git a/.github/workflows/cron-integration-test.yml b/.github/workflows/cron-integration-test.yml index 77a79f0d4c2..4a7c498eeed 100644 --- a/.github/workflows/cron-integration-test.yml +++ b/.github/workflows/cron-integration-test.yml @@ -87,7 +87,7 @@ jobs: - name: Integration Test id: integrationTest run: | - ./gradlew test -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} + ./gradlew test -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} -PskipDockerTests=false - name: Upload integrate tests reports uses: actions/upload-artifact@v3 diff --git a/.github/workflows/flink-integration-test.yml b/.github/workflows/flink-integration-test.yml index 307baedbf28..54141c842f4 100644 --- a/.github/workflows/flink-integration-test.yml +++ b/.github/workflows/flink-integration-test.yml @@ -90,8 +90,8 @@ jobs: - name: Flink Integration Test id: integrationTest run: | - ./gradlew -PskipTests -PtestMode=embedded -PjdkVersion=${{ matrix.java-version }} :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**" - ./gradlew -PskipTests -PtestMode=deploy -PjdkVersion=${{ matrix.java-version }} :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**" + ./gradlew -PskipTests -PtestMode=embedded -PjdkVersion=${{ matrix.java-version }} -PskipDockerTests=false :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**" + ./gradlew -PskipTests -PtestMode=deploy -PjdkVersion=${{ matrix.java-version }} -PskipDockerTests=false :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**" - name: Upload integrate tests reports uses: actions/upload-artifact@v3 diff --git a/.github/workflows/frontend-integration-test.yml b/.github/workflows/frontend-integration-test.yml index a2e96becf54..e8925afb7ca 100644 --- a/.github/workflows/frontend-integration-test.yml +++ b/.github/workflows/frontend-integration-test.yml @@ -93,8 +93,8 @@ jobs: - name: Frontend Integration Test id: integrationTest run: | - ./gradlew -PskipTests -PtestMode=embedded -PjdkVersion=${{ matrix.java-version }} :integration-test:test --tests "com.datastrato.gravitino.integration.test.web.ui.**" - ./gradlew -PskipTests -PtestMode=deploy -PjdkVersion=${{ matrix.java-version }} :integration-test:test --tests "com.datastrato.gravitino.integration.test.web.ui.**" + ./gradlew -PskipTests -PtestMode=embedded -PjdkVersion=${{ matrix.java-version }} -PskipDockerTests=false :integration-test:test --tests "com.datastrato.gravitino.integration.test.web.ui.**" + ./gradlew -PskipTests -PtestMode=deploy -PjdkVersion=${{ matrix.java-version }} -PskipDockerTests=false :integration-test:test --tests "com.datastrato.gravitino.integration.test.web.ui.**" - name: Upload integrate tests reports uses: actions/upload-artifact@v3 diff --git a/.github/workflows/spark-integration-test.yml b/.github/workflows/spark-integration-test.yml index 28910d25bc4..c730942e27c 100644 --- a/.github/workflows/spark-integration-test.yml +++ b/.github/workflows/spark-integration-test.yml @@ -94,10 +94,10 @@ jobs: id: integrationTest run: | if [ "${{ matrix.scala-version }}" == "2.12" ];then - ./gradlew -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} -PscalaVersion=${{ matrix.scala-version }} :spark-connector:spark-3.3:test --tests "com.datastrato.gravitino.spark.connector.integration.test.**" + ./gradlew -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} -PscalaVersion=${{ matrix.scala-version }} -PskipDockerTests=false :spark-connector:spark-3.3:test --tests "com.datastrato.gravitino.spark.connector.integration.test.**" fi - ./gradlew -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} -PscalaVersion=${{ matrix.scala-version }} :spark-connector:spark-3.4:test --tests "com.datastrato.gravitino.spark.connector.integration.test.**" - ./gradlew -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} -PscalaVersion=${{ matrix.scala-version }} :spark-connector:spark-3.5:test --tests "com.datastrato.gravitino.spark.connector.integration.test.**" + ./gradlew -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} -PscalaVersion=${{ matrix.scala-version }} -PskipDockerTests=false :spark-connector:spark-3.4:test --tests "com.datastrato.gravitino.spark.connector.integration.test.**" + ./gradlew -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} -PscalaVersion=${{ matrix.scala-version }} -PskipDockerTests=false :spark-connector:spark-3.5:test --tests "com.datastrato.gravitino.spark.connector.integration.test.**" - name: Upload integrate tests reports uses: actions/upload-artifact@v3 diff --git a/build.gradle.kts b/build.gradle.kts index 500e5aac41e..34b9331c4dd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,12 +10,10 @@ import com.github.jk1.license.render.InventoryHtmlReportRenderer import com.github.jk1.license.render.ReportRenderer import com.github.vlsi.gradle.dsl.configureEach import net.ltgt.gradle.errorprone.errorprone -import org.gradle.api.tasks.testing.Test import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.internal.hash.ChecksumService import org.gradle.internal.os.OperatingSystem import org.gradle.kotlin.dsl.support.serviceOf -import java.io.File import java.io.IOException import java.util.Locale @@ -186,9 +184,9 @@ allprojects { } param.useJUnitPlatform { - val DOCKER_IT_TEST = project.rootProject.extra["docker_it_test"] as? Boolean ?: false - if (!DOCKER_IT_TEST) { - excludeTags("gravitino-docker-it") + val dockerTest = project.rootProject.extra["dockerTest"] as? Boolean ?: false + if (!dockerTest) { + excludeTags("gravitino-docker-test") } } } @@ -657,7 +655,7 @@ tasks { apply(plugin = "com.dorongold.task-tree") -project.extra["docker_it_test"] = false +project.extra["dockerTest"] = false project.extra["dockerRunning"] = false project.extra["macDockerConnector"] = false project.extra["isOrbStack"] = false @@ -676,13 +674,15 @@ fun printDockerCheckInfo() { val macDockerConnector = project.extra["macDockerConnector"] as? Boolean ?: false val isOrbStack = project.extra["isOrbStack"] as? Boolean ?: false - if (OperatingSystem.current().isMacOsX() && + if (extra["skipDockerTests"].toString().toBoolean()) { + project.extra["dockerTest"] = false + } else if (OperatingSystem.current().isMacOsX() && dockerRunning && (macDockerConnector || isOrbStack) ) { - project.extra["docker_it_test"] = true + project.extra["dockerTest"] = true } else if (OperatingSystem.current().isLinux() && dockerRunning) { - project.extra["docker_it_test"] = true + project.extra["dockerTest"] = true } println("------------------ Check Docker environment ---------------------") @@ -692,11 +692,11 @@ fun printDockerCheckInfo() { println("OrbStack status ................................................. [${if (dockerRunning && isOrbStack) "yes" else "no"}]") } - val docker_it_test = project.extra["docker_it_test"] as? Boolean ?: false - if (!docker_it_test) { - println("Run test cases without `gravitino-docker-it` tag ................ [$testMode test]") + val dockerTest = project.extra["dockerTest"] as? Boolean ?: false + if (dockerTest) { + println("Using Docker container to run all tests. [$testMode test]") } else { - println("Using Gravitino IT Docker container to run all integration tests. [$testMode test]") + println("Run test cases without `gravitino-docker-test` tag ................ [$testMode test]") } println("-----------------------------------------------------------------") diff --git a/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HDFSKerberosIT.java b/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HDFSKerberosIT.java index a28407b7f08..0406fea4376 100644 --- a/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HDFSKerberosIT.java +++ b/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HDFSKerberosIT.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class HDFSKerberosIT { private static final Logger LOG = LoggerFactory.getLogger(HDFSKerberosIT.class); diff --git a/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopCatalogIT.java b/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopCatalogIT.java index cb03220bbb1..5cd33d8f959 100644 --- a/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopCatalogIT.java +++ b/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopCatalogIT.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class HadoopCatalogIT extends AbstractIT { private static final Logger LOG = LoggerFactory.getLogger(HadoopCatalogIT.class); private static final ContainerSuite containerSuite = ContainerSuite.getInstance(); diff --git a/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopUserAuthenticationIT.java b/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopUserAuthenticationIT.java index e35902145b5..4cf3399f32b 100644 --- a/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopUserAuthenticationIT.java +++ b/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopUserAuthenticationIT.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; import sun.security.krb5.KrbException; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class HadoopUserAuthenticationIT extends AbstractIT { private static final Logger LOG = LoggerFactory.getLogger(HadoopUserAuthenticationIT.class); diff --git a/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopUserImpersonationIT.java b/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopUserImpersonationIT.java index 534228f62e0..951f84758f8 100644 --- a/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopUserImpersonationIT.java +++ b/catalogs/catalog-hadoop/src/test/java/com/datastrato/gravitino/catalog/hadoop/integration/test/HadoopUserImpersonationIT.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class HadoopUserImpersonationIT extends AbstractIT { private static final Logger LOG = LoggerFactory.getLogger(HadoopCatalogIT.class); diff --git a/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/CatalogHiveIT.java b/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/CatalogHiveIT.java index 57d54808a70..e1948709254 100644 --- a/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/CatalogHiveIT.java +++ b/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/CatalogHiveIT.java @@ -101,7 +101,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogHiveIT extends AbstractIT { private static final Logger LOG = LoggerFactory.getLogger(CatalogHiveIT.class); public static final String metalakeName = diff --git a/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/HiveUserAuthenticationIT.java b/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/HiveUserAuthenticationIT.java index 1ac73a6f185..83d92f509f6 100644 --- a/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/HiveUserAuthenticationIT.java +++ b/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/HiveUserAuthenticationIT.java @@ -47,7 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class HiveUserAuthenticationIT extends AbstractIT { private static final Logger LOG = LoggerFactory.getLogger(HiveUserAuthenticationIT.class); diff --git a/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/ProxyCatalogHiveIT.java b/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/ProxyCatalogHiveIT.java index 837a038b078..65b5981a8e7 100644 --- a/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/ProxyCatalogHiveIT.java +++ b/catalogs/catalog-hive/src/test/java/com/datastrato/gravitino/catalog/hive/integration/test/ProxyCatalogHiveIT.java @@ -49,7 +49,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class ProxyCatalogHiveIT extends AbstractIT { public static final String METALAKE_NAME = diff --git a/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/integration/test/CatalogDorisDriverIT.java b/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/integration/test/CatalogDorisDriverIT.java index 03a36e63e3d..ff0efaad5e9 100644 --- a/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/integration/test/CatalogDorisDriverIT.java +++ b/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/integration/test/CatalogDorisDriverIT.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Tag; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogDorisDriverIT extends CatalogDorisIT { public CatalogDorisDriverIT() { super(); diff --git a/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/integration/test/CatalogDorisIT.java b/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/integration/test/CatalogDorisIT.java index 42b8b5bff67..a3e43ab9320 100644 --- a/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/integration/test/CatalogDorisIT.java +++ b/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/integration/test/CatalogDorisIT.java @@ -52,7 +52,7 @@ import org.junit.jupiter.api.TestInstance.Lifecycle; import org.testcontainers.shaded.org.awaitility.Awaitility; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestInstance(Lifecycle.PER_CLASS) public class CatalogDorisIT extends AbstractIT { diff --git a/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/operation/TestDorisDatabaseOperations.java b/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/operation/TestDorisDatabaseOperations.java index 58a8a396f27..92493b31a39 100644 --- a/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/operation/TestDorisDatabaseOperations.java +++ b/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/operation/TestDorisDatabaseOperations.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class TestDorisDatabaseOperations extends TestDoris { @Test diff --git a/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/operation/TestDorisTableOperations.java b/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/operation/TestDorisTableOperations.java index 5c1c94c137b..46b2a0513fa 100644 --- a/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/operation/TestDorisTableOperations.java +++ b/catalogs/catalog-jdbc-doris/src/test/java/com/datastrato/gravitino/catalog/doris/operation/TestDorisTableOperations.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; import org.testcontainers.shaded.org.awaitility.Awaitility; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class TestDorisTableOperations extends TestDoris { private static final Type VARCHAR_255 = Types.VarCharType.of(255); private static final Type VARCHAR_1024 = Types.VarCharType.of(1024); diff --git a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/AuditCatalogMysqlIT.java b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/AuditCatalogMysqlIT.java index 20a45fe8670..8d0bfa036d0 100644 --- a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/AuditCatalogMysqlIT.java +++ b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/AuditCatalogMysqlIT.java @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class AuditCatalogMysqlIT extends AbstractIT { private static final ContainerSuite containerSuite = ContainerSuite.getInstance(); public static final String metalakeName = GravitinoITUtils.genRandomName("audit_mysql_metalake"); diff --git a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlDriverIT.java b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlDriverIT.java index 910f31a56e4..d92065d4195 100644 --- a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlDriverIT.java +++ b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlDriverIT.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Tag; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogMysqlDriverIT extends CatalogMysqlIT { public CatalogMysqlDriverIT() { super(); diff --git a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlIT.java b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlIT.java index cc6a97460db..7f4138e2fdb 100644 --- a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlIT.java +++ b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlIT.java @@ -67,7 +67,7 @@ import org.junit.jupiter.api.TestInstance.Lifecycle; import org.junit.jupiter.api.condition.EnabledIf; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestInstance(Lifecycle.PER_CLASS) public class CatalogMysqlIT extends AbstractIT { private static final ContainerSuite containerSuite = ContainerSuite.getInstance(); diff --git a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlVersion5IT.java b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlVersion5IT.java index 61376f2b15c..6a55f46c2a2 100644 --- a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlVersion5IT.java +++ b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/integration/test/CatalogMysqlVersion5IT.java @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogMysqlVersion5IT extends CatalogMysqlIT { public CatalogMysqlVersion5IT() { super(); diff --git a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/operation/TestMysqlDatabaseOperations.java b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/operation/TestMysqlDatabaseOperations.java index 2cf3d6bc14e..261468f7b84 100644 --- a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/operation/TestMysqlDatabaseOperations.java +++ b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/operation/TestMysqlDatabaseOperations.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class TestMysqlDatabaseOperations extends TestMysql { @Test diff --git a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/operation/TestMysqlTableOperations.java b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/operation/TestMysqlTableOperations.java index 9a38960e7ce..338b37d81d1 100644 --- a/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/operation/TestMysqlTableOperations.java +++ b/catalogs/catalog-jdbc-mysql/src/test/java/com/datastrato/gravitino/catalog/mysql/operation/TestMysqlTableOperations.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class TestMysqlTableOperations extends TestMysql { private static Type VARCHAR = Types.VarCharType.of(255); private static Type INT = Types.IntegerType.get(); diff --git a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlIT.java b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlIT.java index edecbc2a722..eb0b3131f44 100644 --- a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlIT.java +++ b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlIT.java @@ -66,7 +66,7 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestInstance(Lifecycle.PER_CLASS) public class CatalogPostgreSqlIT extends AbstractIT { private static final ContainerSuite containerSuite = ContainerSuite.getInstance(); diff --git a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion12IT.java b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion12IT.java index bfd9347939d..51bdda2848b 100644 --- a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion12IT.java +++ b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion12IT.java @@ -8,7 +8,7 @@ import com.datastrato.gravitino.integration.test.container.PGImageName; import org.junit.jupiter.api.Tag; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogPostgreSqlVersion12IT extends CatalogPostgreSqlIT { public CatalogPostgreSqlVersion12IT() { postgreImageName = PGImageName.VERSION_12; diff --git a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion14IT.java b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion14IT.java index b7990d8a696..c1193530242 100644 --- a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion14IT.java +++ b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion14IT.java @@ -8,7 +8,7 @@ import com.datastrato.gravitino.integration.test.container.PGImageName; import org.junit.jupiter.api.Tag; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogPostgreSqlVersion14IT extends CatalogPostgreSqlIT { public CatalogPostgreSqlVersion14IT() { postgreImageName = PGImageName.VERSION_14; diff --git a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion15IT.java b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion15IT.java index f53113d9ce2..76080c0c67f 100644 --- a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion15IT.java +++ b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion15IT.java @@ -8,7 +8,7 @@ import com.datastrato.gravitino.integration.test.container.PGImageName; import org.junit.jupiter.api.Tag; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogPostgreSqlVersion15IT extends CatalogPostgreSqlIT { public CatalogPostgreSqlVersion15IT() { postgreImageName = PGImageName.VERSION_15; diff --git a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion16IT.java b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion16IT.java index 975afe3014c..28194aeaf72 100644 --- a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion16IT.java +++ b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/CatalogPostgreSqlVersion16IT.java @@ -8,7 +8,7 @@ import com.datastrato.gravitino.integration.test.container.PGImageName; import org.junit.jupiter.api.Tag; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogPostgreSqlVersion16IT extends CatalogPostgreSqlIT { public CatalogPostgreSqlVersion16IT() { postgreImageName = PGImageName.VERSION_16; diff --git a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/TestMultipleJDBCLoad.java b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/TestMultipleJDBCLoad.java index bbb4a288f8c..c8f62bf72dd 100644 --- a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/TestMultipleJDBCLoad.java +++ b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/integration/test/TestMultipleJDBCLoad.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class TestMultipleJDBCLoad extends AbstractIT { private static final ContainerSuite containerSuite = ContainerSuite.getInstance(); private static final TestDatabaseName TEST_DB_NAME = diff --git a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java index 33292a1ddad..b914ed297b2 100644 --- a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java +++ b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.testcontainers.shaded.com.google.common.collect.Maps; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class TestPostgreSqlSchemaOperations extends TestPostgreSql { @Test diff --git a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/operation/TestPostgreSqlTableOperations.java b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/operation/TestPostgreSqlTableOperations.java index ae2ee11f44f..253de8dd89f 100644 --- a/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/operation/TestPostgreSqlTableOperations.java +++ b/catalogs/catalog-jdbc-postgresql/src/test/java/com/datastrato/gravitino/catalog/postgresql/operation/TestPostgreSqlTableOperations.java @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test; import org.testcontainers.shaded.com.google.common.collect.Maps; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class TestPostgreSqlTableOperations extends TestPostgreSql { private static Type VARCHAR = Types.VarCharType.of(255); diff --git a/catalogs/catalog-kafka/src/test/java/com/datastrato/gravitino/catalog/kafka/integration/test/CatalogKafkaIT.java b/catalogs/catalog-kafka/src/test/java/com/datastrato/gravitino/catalog/kafka/integration/test/CatalogKafkaIT.java index 8cf185ff289..e01466b17ab 100644 --- a/catalogs/catalog-kafka/src/test/java/com/datastrato/gravitino/catalog/kafka/integration/test/CatalogKafkaIT.java +++ b/catalogs/catalog-kafka/src/test/java/com/datastrato/gravitino/catalog/kafka/integration/test/CatalogKafkaIT.java @@ -57,7 +57,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogKafkaIT extends AbstractIT { private static final Logger LOG = LoggerFactory.getLogger(CatalogKafkaIT.class); private static final ContainerSuite CONTAINER_SUITE = ContainerSuite.getInstance(); diff --git a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergHiveIT.java b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergHiveIT.java index bd335ab61bc..4a1680ce2cf 100644 --- a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergHiveIT.java +++ b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergHiveIT.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.TestInstance; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class CatalogIcebergHiveIT extends CatalogIcebergBaseIT { diff --git a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergKerberosHiveIT.java b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergKerberosHiveIT.java index d406498a756..07389277c82 100644 --- a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergKerberosHiveIT.java +++ b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergKerberosHiveIT.java @@ -47,7 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogIcebergKerberosHiveIT extends AbstractIT { private static final Logger LOG = LoggerFactory.getLogger(CatalogIcebergKerberosHiveIT.class); diff --git a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergRestIT.java b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergRestIT.java index 58365e0ed6a..19b0c8b2354 100644 --- a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergRestIT.java +++ b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergRestIT.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.TestInstance; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class CatalogIcebergRestIT extends CatalogIcebergBaseIT { diff --git a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTHiveCatalogIT.java b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTHiveCatalogIT.java index e37b8370ca4..6ba83a51b49 100644 --- a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTHiveCatalogIT.java +++ b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTHiveCatalogIT.java @@ -17,10 +17,10 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; -// Hive&Jdbc catalog must be tested with gravitino-docker-it env, +// Hive&Jdbc catalog must be tested with gravitino-docker-test env, // so we should create a separate class instead using junit `parameterized test` // to auto-generate catalog type -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestInstance(Lifecycle.PER_CLASS) public class IcebergRESTHiveCatalogIT extends IcebergRESTServiceIT { private static final ContainerSuite containerSuite = ContainerSuite.getInstance(); diff --git a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTJdbcCatalogIT.java b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTJdbcCatalogIT.java index 3f4518f2510..41b4b64dde9 100644 --- a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTJdbcCatalogIT.java +++ b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTJdbcCatalogIT.java @@ -18,7 +18,7 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestInstance(Lifecycle.PER_CLASS) public class IcebergRESTJdbcCatalogIT extends IcebergRESTServiceIT { private static final ContainerSuite containerSuite = ContainerSuite.getInstance(); diff --git a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTServiceIT.java b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTServiceIT.java index 63fd6ca34a9..e1824176ef0 100644 --- a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTServiceIT.java +++ b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/IcebergRESTServiceIT.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.TestInstance.Lifecycle; import org.junit.jupiter.api.condition.EnabledIf; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @SuppressWarnings("FormatStringAnnotation") @TestInstance(Lifecycle.PER_CLASS) public class IcebergRESTServiceIT extends IcebergRESTServiceBaseIT { diff --git a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/TestMultipleJDBCLoad.java b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/TestMultipleJDBCLoad.java index 92af3776549..592e3d988e9 100644 --- a/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/TestMultipleJDBCLoad.java +++ b/catalogs/catalog-lakehouse-iceberg/src/test/java/com/datastrato/gravitino/catalog/lakehouse/iceberg/integration/test/TestMultipleJDBCLoad.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class TestMultipleJDBCLoad extends AbstractIT { private static final TestDatabaseName TEST_DB_NAME = TestDatabaseName.PG_TEST_ICEBERG_CATALOG_MULTIPLE_JDBC_LOAD; diff --git a/catalogs/catalog-lakehouse-paimon/src/test/java/com/datastrato/gravitino/catalog/lakehouse/paimon/integration/test/CatalogPaimonFileSystemIT.java b/catalogs/catalog-lakehouse-paimon/src/test/java/com/datastrato/gravitino/catalog/lakehouse/paimon/integration/test/CatalogPaimonFileSystemIT.java index d5587250e5d..84a5860420f 100644 --- a/catalogs/catalog-lakehouse-paimon/src/test/java/com/datastrato/gravitino/catalog/lakehouse/paimon/integration/test/CatalogPaimonFileSystemIT.java +++ b/catalogs/catalog-lakehouse-paimon/src/test/java/com/datastrato/gravitino/catalog/lakehouse/paimon/integration/test/CatalogPaimonFileSystemIT.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.TestInstance; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class CatalogPaimonFileSystemIT extends CatalogPaimonBaseIT { diff --git a/docs/how-to-build.md b/docs/how-to-build.md index 7c2c46299ce..de22c4647ee 100644 --- a/docs/how-to-build.md +++ b/docs/how-to-build.md @@ -26,7 +26,9 @@ This software is licensed under the Apache License version 2." You don't have to preinstall the specified JDK environment, as Gradle detects the JDK version needed and downloads it automatically. + Gravitino uses the Gradle Java Toolchain to detect and manage JDK versions, it checks the installed JDK by running the `./gradlew javaToolchains` command. See [Gradle Java Toolchain](https://docs.gradle.org/current/userguide/toolchains.html#sec:java_toolchain). -+ Make sure you have installed Docker in your environment if you plan to run integration texts. Without it, some Docker-related tests may not run. ++ Gravitino excludes all Docker-related tests by default. To run Docker related tests, make sure you have installed + Docker in your environment and set `skipDockerTests=false` in the `gradle.properties` file (or + use `-PskipDockerTests=false` in the command). Otherwise, all Docker required tests will skip. + macOS uses `docker-connector` to make the Gravitino Trino connector work with Docker for macOS. See [docker-connector](https://github.com/wenjunxiao/mac-docker-connector), `$GRAVITINO_HOME/dev/docker/tools/mac-docker-connector.sh`, and `$GRAVITINO_HOME/dev/docker/tools/README.md` for more details. diff --git a/docs/how-to-test.md b/docs/how-to-test.md index eb7456eb997..16a3e605c2b 100644 --- a/docs/how-to-test.md +++ b/docs/how-to-test.md @@ -86,16 +86,16 @@ For example: Some integration test cases depend on the Gravitino CI Docker image. If an integration test relies on the specific Gravitino CI Docker image, -set the `@tag(gravitino-docker-it)` annotation in the test class. +set the `@tag(gravitino-docker-test)` annotation in the test class. For example, the `integration-test/src/test/.../CatalogHiveIT.java` test needs to connect to the `datastrato/gravitino-ci-hive` Docker container for testing the Hive data source. -Therefore, it should have the following `@tag` annotation:`@tag(gravitino-docker-it)`. This annotation +Therefore, it should have the following `@tag` annotation:`@tag(gravitino-docker-test)`. This annotation helps identify the specific Docker container required for the integration test. For example: ```java -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogHiveIT extends AbstractIT { ... } @@ -105,7 +105,7 @@ public class CatalogHiveIT extends AbstractIT { :::note * Make sure that the `Docker server` is running before running all the - integration tests. Otherwise, it only runs the integration tests without the `gravitino-docker-it` tag. + integration tests. Otherwise, it only runs the integration tests without the `gravitino-docker-test` tag. * On macOS, be sure to run the `${GRAVITINO_HOME}/dev/docker/tools/mac-docker-connector.sh` script before running the integration tests; or make sure that [OrbStack](https://orbstack.dev/) is running. @@ -124,7 +124,7 @@ Using Gravitino IT Docker container to run all integration tests. [deploy test] ``` Complete integration tests only run when all the required environments are met. Otherwise, -only parts of them without the `gravitino-docker-it` tag run. +only parts of them without the `gravitino-docker-test` tag run. ## How to debug Gravitino server and integration tests in embedded mode diff --git a/flink-connector/src/test/java/com/datastrato/gravitino/flink/connector/integration/test/hive/FlinkHiveCatalogIT.java b/flink-connector/src/test/java/com/datastrato/gravitino/flink/connector/integration/test/hive/FlinkHiveCatalogIT.java index 99250ce1a01..e861021db86 100644 --- a/flink-connector/src/test/java/com/datastrato/gravitino/flink/connector/integration/test/hive/FlinkHiveCatalogIT.java +++ b/flink-connector/src/test/java/com/datastrato/gravitino/flink/connector/integration/test/hive/FlinkHiveCatalogIT.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class FlinkHiveCatalogIT extends FlinkEnvIT { private static final String DEFAULT_CATALOG = "default_catalog"; diff --git a/gradle.properties b/gradle.properties index 698f7877bd1..03b33adfd71 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,3 +24,6 @@ defaultScalaVersion = 2.12 # pythonVersion is used to specify the version of Python to build and test Gravitino python client. pythonVersion = 3.8 + +# skipDockerTests is used to skip the tests that require Docker to be running. +skipDockerTests = true diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/authorization/ranger/RangerIT.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/authorization/ranger/RangerIT.java index beb505a5719..ff16e601bf1 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/authorization/ranger/RangerIT.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/authorization/ranger/RangerIT.java @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class RangerIT { private static final String serviceName = "trino-test"; private static final String trinoType = "trino"; diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/AuditIT.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/AuditIT.java index 5ef27ff9792..1fc5b2435cf 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/AuditIT.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/AuditIT.java @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class AuditIT extends AbstractIT { private static final String expectUser = System.getProperty("user.name"); diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/CatalogIT.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/CatalogIT.java index d945adb63a5..6ea71675dc0 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/CatalogIT.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/CatalogIT.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class CatalogIT extends AbstractIT { private static final Logger LOG = LoggerFactory.getLogger(CatalogIT.class); diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/MetalakeIT.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/MetalakeIT.java index 0b1bb9fe660..37d01114249 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/MetalakeIT.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/MetalakeIT.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MetalakeIT extends AbstractIT { public static String metalakeNameA = RandomNameUtils.genRandomName("metalakeA"); diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/filesystem/hadoop/GravitinoVirtualFileSystemIT.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/filesystem/hadoop/GravitinoVirtualFileSystemIT.java index 481c86c6071..9e1ef2ad149 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/filesystem/hadoop/GravitinoVirtualFileSystemIT.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/client/filesystem/hadoop/GravitinoVirtualFileSystemIT.java @@ -39,7 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class GravitinoVirtualFileSystemIT extends AbstractIT { private static final Logger LOG = LoggerFactory.getLogger(GravitinoVirtualFileSystemIT.class); private static final ContainerSuite containerSuite = ContainerSuite.getInstance(); diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/store/relational/service/FilesetMetaServiceIT.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/store/relational/service/FilesetMetaServiceIT.java index dd5c625fb14..c7e2e2a7415 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/store/relational/service/FilesetMetaServiceIT.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/store/relational/service/FilesetMetaServiceIT.java @@ -55,7 +55,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class FilesetMetaServiceIT { private static final Logger LOG = LoggerFactory.getLogger(FilesetMetaServiceIT.class); private static final ContainerSuite containerSuite = ContainerSuite.getInstance(); diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/trino/TrinoConnectorIT.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/trino/TrinoConnectorIT.java index c81f2531c46..a197c62a05c 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/trino/TrinoConnectorIT.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/trino/TrinoConnectorIT.java @@ -54,7 +54,7 @@ @Disabled @Deprecated -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class TrinoConnectorIT extends AbstractIT { public static final Logger LOG = LoggerFactory.getLogger(TrinoConnectorIT.class); diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/trino/TrinoQueryIT.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/trino/TrinoQueryIT.java index 0c332ea13c3..d7b772828d7 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/trino/TrinoQueryIT.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/trino/TrinoQueryIT.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class TrinoQueryIT extends TrinoQueryITBase { private static final Logger LOG = LoggerFactory.getLogger(TrinoQueryIT.class); diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/KerberosOperationsIT.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/KerberosOperationsIT.java index d5f6cc83c8f..e15b0b58cf9 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/KerberosOperationsIT.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/KerberosOperationsIT.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import org.testcontainers.shaded.com.google.common.util.concurrent.Uninterruptibles; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class KerberosOperationsIT extends AbstractIT { private static final KerberosSecurityTestcase kdc = diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/OAuth2OperationsIT.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/OAuth2OperationsIT.java index 1e0889ac997..8b66848e8fa 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/OAuth2OperationsIT.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/OAuth2OperationsIT.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class OAuth2OperationsIT extends AbstractIT { private static final KeyPair keyPair = Keys.keyPairFor(SignatureAlgorithm.RS256); diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/VersionOperationsIT.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/VersionOperationsIT.java index ed2b874857c..fae9f99d4bf 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/VersionOperationsIT.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/rest/VersionOperationsIT.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") public class VersionOperationsIT extends AbstractIT { @Test public void testGetVersion() { diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageDorisTest.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageDorisTest.java index 65acd198624..127105c025b 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageDorisTest.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageDorisTest.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class CatalogsPageDorisTest extends AbstractWebIT { MetalakePage metalakePage = new MetalakePage(); diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageKafkaTest.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageKafkaTest.java index 1d788b835f4..daad96031e3 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageKafkaTest.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageKafkaTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class CatalogsPageKafkaTest extends AbstractWebIT { MetalakePage metalakePage = new MetalakePage(); diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageTest.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageTest.java index 1b8db8262c9..30565589d7b 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageTest.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/CatalogsPageTest.java @@ -44,7 +44,7 @@ import org.openqa.selenium.By; import org.testcontainers.shaded.org.awaitility.Awaitility; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class CatalogsPageTest extends AbstractWebIT { MetalakePage metalakePage = new MetalakePage(); diff --git a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/MetalakePageTest.java b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/MetalakePageTest.java index b494e026b3e..f995528396c 100644 --- a/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/MetalakePageTest.java +++ b/integration-test/src/test/java/com/datastrato/gravitino/integration/test/web/ui/MetalakePageTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MetalakePageTest extends AbstractWebIT { private static final String WEB_TITLE = "Gravitino"; diff --git a/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/hive/SparkHiveCatalogIT.java b/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/hive/SparkHiveCatalogIT.java index 497ad3d4a41..fe33b78aded 100644 --- a/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/hive/SparkHiveCatalogIT.java +++ b/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/hive/SparkHiveCatalogIT.java @@ -26,7 +26,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestInstance(TestInstance.Lifecycle.PER_CLASS) public abstract class SparkHiveCatalogIT extends SparkCommonIT { diff --git a/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/iceberg/SparkIcebergCatalogHiveBackendIT.java b/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/iceberg/SparkIcebergCatalogHiveBackendIT.java index d8af85fbf04..079c8eec604 100644 --- a/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/iceberg/SparkIcebergCatalogHiveBackendIT.java +++ b/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/iceberg/SparkIcebergCatalogHiveBackendIT.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.TestInstance; /** This class use Iceberg HiveCatalog for backend catalog. */ -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestInstance(TestInstance.Lifecycle.PER_CLASS) public abstract class SparkIcebergCatalogHiveBackendIT extends SparkIcebergCatalogIT { diff --git a/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/iceberg/SparkIcebergCatalogRestBackendIT.java b/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/iceberg/SparkIcebergCatalogRestBackendIT.java index 8f7c5126df9..bdd39504791 100644 --- a/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/iceberg/SparkIcebergCatalogRestBackendIT.java +++ b/spark-connector/spark-common/src/test/java/com/datastrato/gravitino/spark/connector/integration/test/iceberg/SparkIcebergCatalogRestBackendIT.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.TestInstance; /** This class use Iceberg RESTCatalog for test, and the real backend catalog is HiveCatalog. */ -@Tag("gravitino-docker-it") +@Tag("gravitino-docker-test") @TestInstance(TestInstance.Lifecycle.PER_CLASS) public abstract class SparkIcebergCatalogRestBackendIT extends SparkIcebergCatalogIT {