From acf79aac27ca776a8d4ecb894ad5f9507d738f93 Mon Sep 17 00:00:00 2001 From: unknowntpo Date: Wed, 22 May 2024 12:33:43 +0800 Subject: [PATCH] change hive image back to gravitino-ci-hive, update changelog --- catalogs/catalog-hadoop/build.gradle.kts | 2 +- catalogs/catalog-hive/build.gradle.kts | 2 +- catalogs/catalog-lakehouse-iceberg/build.gradle.kts | 2 +- docs/docker-image-details.md | 3 +++ .../gravitino/integration/test/container/ContainerSuite.java | 1 - integration-test/build.gradle.kts | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/catalogs/catalog-hadoop/build.gradle.kts b/catalogs/catalog-hadoop/build.gradle.kts index 46e37babc0..3596f6e9e9 100644 --- a/catalogs/catalog-hadoop/build.gradle.kts +++ b/catalogs/catalog-hadoop/build.gradle.kts @@ -98,7 +98,7 @@ tasks.test { dependsOn(tasks.jar) doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.11") + environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.12") } val init = project.extra.get("initIntegrationTest") as (Test) -> Unit diff --git a/catalogs/catalog-hive/build.gradle.kts b/catalogs/catalog-hive/build.gradle.kts index 179ae2ada8..bf01ee5fc0 100644 --- a/catalogs/catalog-hive/build.gradle.kts +++ b/catalogs/catalog-hive/build.gradle.kts @@ -164,7 +164,7 @@ tasks.test { dependsOn(tasks.jar) doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.11") + environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.12") } val init = project.extra.get("initIntegrationTest") as (Test) -> Unit diff --git a/catalogs/catalog-lakehouse-iceberg/build.gradle.kts b/catalogs/catalog-lakehouse-iceberg/build.gradle.kts index 56100fe2db..2a846d3651 100644 --- a/catalogs/catalog-lakehouse-iceberg/build.gradle.kts +++ b/catalogs/catalog-lakehouse-iceberg/build.gradle.kts @@ -162,7 +162,7 @@ tasks.test { dependsOn(tasks.jar) doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.11") + environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.12") } val init = project.extra.get("initIntegrationTest") as (Test) -> Unit diff --git a/docs/docker-image-details.md b/docs/docker-image-details.md index 473353fa1a..f5373bb400 100644 --- a/docs/docker-image-details.md +++ b/docs/docker-image-details.md @@ -100,6 +100,9 @@ You can use this kind of image to test the catalog of Apache Hive. Changelog +- gravitino-ci-hive:0.1.12 + - Shrink hive Docker image size by 420MB + - gravitino-ci-hive:0.1.11 - Remove `yarn` from the startup script; Remove `yarn-site.xml` and `yarn-env.sh` files; - Change the value of `mapreduce.framework.name` from `yarn` to `local` in the `mapred-site.xml` file. diff --git a/integration-test-common/src/test/java/com/datastrato/gravitino/integration/test/container/ContainerSuite.java b/integration-test-common/src/test/java/com/datastrato/gravitino/integration/test/container/ContainerSuite.java index 841fe80a73..22b10306ab 100644 --- a/integration-test-common/src/test/java/com/datastrato/gravitino/integration/test/container/ContainerSuite.java +++ b/integration-test-common/src/test/java/com/datastrato/gravitino/integration/test/container/ContainerSuite.java @@ -88,7 +88,6 @@ public void startHiveContainer() { HiveContainer.Builder hiveBuilder = HiveContainer.builder() .withHostName("gravitino-ci-hive") - .withImage("unknowntpo/gravitino-ci-hive:latest") .withEnvVars( ImmutableMap.builder() .put("HADOOP_USER_NAME", "datastrato") diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts index dc464d48d4..d5a18edf03 100644 --- a/integration-test/build.gradle.kts +++ b/integration-test/build.gradle.kts @@ -160,7 +160,7 @@ tasks.test { doFirst { // Gravitino CI Docker image - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.11") + environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.12") environment("GRAVITINO_CI_TRINO_DOCKER_IMAGE", "datastrato/gravitino-ci-trino:0.1.5") environment("GRAVITINO_CI_KAFKA_DOCKER_IMAGE", "apache/kafka:3.7.0") environment("GRAVITINO_CI_DORIS_DOCKER_IMAGE", "datastrato/gravitino-ci-doris:0.1.3")