This is an automated email from the ASF dual-hosted git repository. yuqi4733 pushed a commit to branch issue-4445_for_test in repository https://gitbox.apache.org/repos/asf/gravitino.git
commit 730d0160c311c4557c96199f11d7e51954f01377 Author: xunliu <[email protected]> AuthorDate: Thu Aug 8 21:00:34 2024 +0800 tmp --- .github/workflows/docker-image.yml | 57 ++++++------ build.gradle.kts | 8 ++ catalogs/catalog-hadoop/build.gradle.kts | 5 - catalogs/catalog-hive/build.gradle.kts | 5 - catalogs/catalog-jdbc-doris/build.gradle.kts | 4 - catalogs/catalog-kafka/build.gradle.kts | 4 - .../catalog-lakehouse-iceberg/build.gradle.kts | 5 - catalogs/catalog-lakehouse-paimon/build.gradle.kts | 5 - clients/client-python/build.gradle.kts | 1 - docs/docker-image-details.md | 101 +++++++++++---------- flink-connector/build.gradle.kts | 4 - iceberg/iceberg-rest-server/build.gradle.kts | 5 - integration-test/build.gradle.kts | 7 -- spark-connector/spark-common/build.gradle.kts | 4 - spark-connector/v3.3/spark/build.gradle.kts | 4 - spark-connector/v3.4/spark/build.gradle.kts | 4 - spark-connector/v3.5/spark/build.gradle.kts | 4 - 17 files changed, 93 insertions(+), 134 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c8d63f0af..dc1a0c6f7 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -10,14 +10,14 @@ on: default: 'gravitino' options: - 'gravitino' - - 'gravitino-ci-hive' - - 'gravitino-ci-kerberos-hive' - - 'gravitino-ci-trino' - - 'gravitino-ci-doris' - - 'gravitino-ci-ranger' - - 'gravitino-playground-trino' - - 'gravitino-playground-hive' - - 'gravitino-playground-ranger' + - 'gravitino:ci-hive' + - 'gravitino:ci-kerberos-hive' + - 'gravitino:ci-trino' + - 'gravitino:ci-doris' + - 'gravitino:ci-ranger' + - 'gravitino:playground-trino' + - 'gravitino:playground-hive' + - 'gravitino:playground-ranger' version: description: 'Docker version to apply to this image' required: true @@ -37,33 +37,33 @@ jobs: steps: - name: Set environment variables run: | - if [ "${{ github.event.inputs.image }}" == "gravitino-ci-hive" ]; then + if [ "${{ github.event.inputs.image }}" == "gravitino:ci-hive" ]; then echo "image_type=hive" >> $GITHUB_ENV - echo "tag_name=ci-hive-" >> $GITHUB_ENV - elif [ "${{ github.event.inputs.image }}" == "gravitino-ci-kerberos-hive" ]; then + echo "tag_name=ci-hive" >> $GITHUB_ENV + elif [ "${{ github.event.inputs.image }}" == "gravitino:ci-kerberos-hive" ]; then echo "image_type=kerberos-hive" >> $GITHUB_ENV - echo "tag_name=ci-kerberos-hive-" >> $GITHUB_ENV - elif [ "${{ github.event.inputs.image }}" == "gravitino-ci-trino" ]; then + echo "tag_name=ci-kerberos-hive" >> $GITHUB_ENV + elif [ "${{ github.event.inputs.image }}" == "gravitino:ci-trino" ]; then echo "image_type=trino" >> $GITHUB_ENV - echo "tag_name=ci-trino-" >> $GITHUB_ENV - elif [ "${{ github.event.inputs.image }}" == "gravitino-ci-doris" ]; then + echo "tag_name=ci-trino" >> $GITHUB_ENV + elif [ "${{ github.event.inputs.image }}" == "gravitino:ci-doris" ]; then echo "image_type=doris" >> $GITHUB_ENV - echo "tag_name=ci-doris-" >> $GITHUB_ENV - elif [ "${{ github.event.inputs.image }}" == "gravitino-ci-ranger" ]; then + echo "tag_name=ci-doris" >> $GITHUB_ENV + elif [ "${{ github.event.inputs.image }}" == "gravitino:ci-ranger" ]; then echo "image_type=ranger" >> $GITHUB_ENV - echo "tag_name=ci-ranger-" >> $GITHUB_ENV + echo "tag_name=ci-ranger" >> $GITHUB_ENV elif [ "${{ github.event.inputs.image }}" == "gravitino" ]; then echo "image_type=gravitino" >> $GITHUB_ENV - # `apache/gravitino` is the default image name, didn't need to tag name - elif [ "${{ github.event.inputs.image }}" == "gravitino-playground-trino" ]; then + # `apache/gravitino` is the default image name, didn't need to tag alias name + elif [ "${{ github.event.inputs.image }}" == "gravitino:playground-trino" ]; then echo "image_type=trino" >> $GITHUB_ENV - echo "tag_name=playground-trino-" >> $GITHUB_ENV - elif [ "${{ github.event.inputs.image }}" == "gravitino-playground-hive" ]; then + echo "tag_name=playground-trino" >> $GITHUB_ENV + elif [ "${{ github.event.inputs.image }}" == "gravitino:playground-hive" ]; then echo "image_type=hive" >> $GITHUB_ENV - echo "tag_name=playground-hive-" >> $GITHUB_ENV - elif [ "${{ github.event.inputs.image }}" == "gravitino-playground-ranger" ]; then + echo "tag_name=playground-hive" >> $GITHUB_ENV + elif [ "${{ github.event.inputs.image }}" == "gravitino:playground-ranger" ]; then echo "image_type=ranger" >> $GITHUB_ENV - echo "tag_name=playground-ranger-" >> $GITHUB_ENV + echo "tag_name=playground-ranger" >> $GITHUB_ENV fi - name: Check publish Docker token @@ -96,4 +96,9 @@ jobs: run: | sudo rm -rf /usr/local/lib/android sudo rm -rf /opt/hostedtoolcache/CodeQL - ./dev/docker/build-docker.sh --platform all --type ${image_type} --image apache/gravitino --tag ${tag_name}${{ github.event.inputs.version }} --latest + if [[ "${image_type}" != "gravitino" ]]; then + # Only build the latest image for gravitino + ./dev/docker/build-docker.sh --platform all --type ${image_type} --image apache/gravitino --tag ${{ github.event.inputs.version }} --latest + else + ./dev/docker/build-docker.sh --platform all --type ${image_type} --image apache/gravitino --tag ${tag_name}-${{ github.event.inputs.version }} + fi \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 13023bcd8..e6057ec49 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -167,6 +167,14 @@ allprojects { param.environment("HADOOP_HOME", "/tmp") param.environment("PROJECT_VERSION", project.version) + // Gravitino CI Docker image + param.environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "apache/gravitino:ci-hive-0.1.13") + param.environment("GRAVITINO_CI_KERBEROS_HIVE_DOCKER_IMAGE", "apache/gravitino:ci-kerberos-hive-0.1.5") + param.environment("GRAVITINO_CI_DORIS_DOCKER_IMAGE", "apache/gravitino:ci-doris-0.1.5") + param.environment("GRAVITINO_CI_TRINO_DOCKER_IMAGE", "apache/gravitino:ci-trino-0.1.5") + param.environment("GRAVITINO_CI_RANGER_DOCKER_IMAGE", "apache/gravitino:ci-ranger-0.1.1") + param.environment("GRAVITINO_CI_KAFKA_DOCKER_IMAGE", "apache/kafka:3.7.0") + val dockerRunning = project.rootProject.extra["dockerRunning"] as? Boolean ?: false val macDockerConnector = project.rootProject.extra["macDockerConnector"] as? Boolean ?: false if (OperatingSystem.current().isMacOsX() && diff --git a/catalogs/catalog-hadoop/build.gradle.kts b/catalogs/catalog-hadoop/build.gradle.kts index ba85c3b6e..9254c0016 100644 --- a/catalogs/catalog-hadoop/build.gradle.kts +++ b/catalogs/catalog-hadoop/build.gradle.kts @@ -124,11 +124,6 @@ tasks.test { } else { dependsOn(tasks.jar) - doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.13") - environment("GRAVITINO_CI_KERBEROS_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-kerberos-hive:0.1.5") - } - val init = project.extra.get("initIntegrationTest") as (Test) -> Unit init(this) } diff --git a/catalogs/catalog-hive/build.gradle.kts b/catalogs/catalog-hive/build.gradle.kts index c9c7422c6..58213719f 100644 --- a/catalogs/catalog-hive/build.gradle.kts +++ b/catalogs/catalog-hive/build.gradle.kts @@ -178,11 +178,6 @@ tasks.test { } else { dependsOn(tasks.jar) - doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.13") - environment("GRAVITINO_CI_KERBEROS_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-kerberos-hive:0.1.5") - } - val init = project.extra.get("initIntegrationTest") as (Test) -> Unit init(this) } diff --git a/catalogs/catalog-jdbc-doris/build.gradle.kts b/catalogs/catalog-jdbc-doris/build.gradle.kts index 0d01a5cc0..77b820182 100644 --- a/catalogs/catalog-jdbc-doris/build.gradle.kts +++ b/catalogs/catalog-jdbc-doris/build.gradle.kts @@ -83,10 +83,6 @@ tasks { tasks.test { val skipUTs = project.hasProperty("skipTests") - doFirst { - environment("GRAVITINO_CI_DORIS_DOCKER_IMAGE", "datastrato/gravitino-ci-doris:0.1.5") - } - if (skipUTs) { // Only run integration tests include("**/integration/**") diff --git a/catalogs/catalog-kafka/build.gradle.kts b/catalogs/catalog-kafka/build.gradle.kts index 8ce72eeba..8d816459c 100644 --- a/catalogs/catalog-kafka/build.gradle.kts +++ b/catalogs/catalog-kafka/build.gradle.kts @@ -106,10 +106,6 @@ tasks.test { } else { dependsOn(tasks.jar) - doFirst { - environment("GRAVITINO_CI_KAFKA_DOCKER_IMAGE", "apache/kafka:3.7.0") - } - val init = project.extra.get("initIntegrationTest") as (Test) -> Unit init(this) } diff --git a/catalogs/catalog-lakehouse-iceberg/build.gradle.kts b/catalogs/catalog-lakehouse-iceberg/build.gradle.kts index f7a251480..07b98b9cc 100644 --- a/catalogs/catalog-lakehouse-iceberg/build.gradle.kts +++ b/catalogs/catalog-lakehouse-iceberg/build.gradle.kts @@ -149,11 +149,6 @@ tasks.test { } else { dependsOn(tasks.jar) - doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.13") - environment("GRAVITINO_CI_KERBEROS_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-kerberos-hive:0.1.5") - } - val init = project.extra.get("initIntegrationTest") as (Test) -> Unit init(this) } diff --git a/catalogs/catalog-lakehouse-paimon/build.gradle.kts b/catalogs/catalog-lakehouse-paimon/build.gradle.kts index 757fe7060..04fcb7462 100644 --- a/catalogs/catalog-lakehouse-paimon/build.gradle.kts +++ b/catalogs/catalog-lakehouse-paimon/build.gradle.kts @@ -137,11 +137,6 @@ tasks.test { } else { dependsOn(tasks.jar) - doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.13") - environment("GRAVITINO_CI_KERBEROS_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-kerberos-hive:0.1.3") - } - val init = project.extra.get("initIntegrationTest") as (Test) -> Unit init(this) } diff --git a/clients/client-python/build.gradle.kts b/clients/client-python/build.gradle.kts index 6a92bd06d..c35a7f02b 100644 --- a/clients/client-python/build.gradle.kts +++ b/clients/client-python/build.gradle.kts @@ -222,7 +222,6 @@ tasks { "GRAVITINO_HOME" to project.rootDir.path + "/distribution/package", "START_EXTERNAL_GRAVITINO" to "true", "DOCKER_TEST" to dockerTest.toString(), - "GRAVITINO_CI_HIVE_DOCKER_IMAGE" to "datastrato/gravitino-ci-hive:0.1.13", // Set the PYTHONPATH to the client-python directory, make sure the tests can import the // modules from the client-python directory. "PYTHONPATH" to "${project.rootDir.path}/clients/client-python" diff --git a/docs/docker-image-details.md b/docs/docker-image-details.md index 16c7a9659..cf4dc7f77 100644 --- a/docs/docker-image-details.md +++ b/docs/docker-image-details.md @@ -14,28 +14,28 @@ You can deploy the service with the Gravitino Docker image. Container startup commands ```shell -docker run --rm -d -p 8090:8090 -p 9001:9001 datastrato/gravitino +docker run --rm -d -p 8090:8090 -p 9001:9001 apache/gravitino ``` Changelog -- gravitino:0.5.1 +- datastrato/gravitino:0.5.1 - Based on Gravitino 0.5.1, you can know more information from 0.5.1 release notes. -- gravitino:0.5.0 +- datastrato/gravitino:0.5.0 - Based on Gravitino 0.5.0, you can know more information from 0.5.0 release notes. -- gravitino:0.4.0 +- datastrato/gravitino:0.4.0 - Based on Gravitino 0.4.0, you can know more information from 0.4.0 release notes. -- gravitino:0.3.1 +- datastrato/gravitino:0.3.1 - Fix some issues -- gravitino:0.3.0 +- datastrato/gravitino:0.3.0 - Docker image `datastrato/gravitino:0.3.0` - Gravitino Server - Expose ports: @@ -54,7 +54,7 @@ docker run --rm -d -p 9001:9001 datastrato/gravitino-iceberg-rest-server Changelog -- gravitino-iceberg-rest-server:0.6.0 +- datastrato/gravitino-iceberg-rest-server:0.6.0 - Docker image `datastrato/gravitino-iceberg-rest-server:0.6.0` - Gravitino Iceberg REST Server with memory catalog backend. - Expose ports: @@ -72,7 +72,7 @@ The Docker images of the playground have suitable configurations for users to ex Changelog -- hive:2.7.3-no-yarn +- datastrato/hive:2.7.3-no-yarn - Docker image `datastrato/hive:2.7.3-no-yarn` - `hadoop-2.7.3` - `hive-2.3.9` @@ -82,23 +82,23 @@ Changelog Changelog -- trino:435-gravitino-0.5.1 +- datastrato/trino:435-gravitino-0.5.1 - Based on Gravitino 0.5.1, you can know more information from 0.5.1 release notes. -- trino:426-gravitino-0.5.0 +- datastrato/trino:426-gravitino-0.5.0 - Based on Gravitino 0.5.0, you can know more information from 0.5.0 release notes. -- trino:426-gravitino-0.4.0 +- datastrato/trino:426-gravitino-0.4.0 - Based on Gravitino 0.4.0, you can know more information from 0.4.0 release notes. -- trino:426-gravitino-0.3.1 +- datastrato/trino:426-gravitino-0.3.1 - Fix some issues -- trino:426-gravitino-0.3.0 +- datastrato/trino:426-gravitino-0.3.0 - Docker image `datastrato/trino:426-gravitino-0.3.0` - Base on `trino:462` - Added Gravitino trino-connector-0.3.0 libraries into the `/usr/lib/trino/plugin/gravitino` @@ -112,28 +112,28 @@ You can use these kinds of Docker images to facilitate integration testing of al You can use this kind of image to test the catalog of Apache Hive with kerberos enable Changelog -- gravitino-ci-kerberos-hive:0.1.5 +- datastrato/gravitino-ci-kerberos-hive:0.1.5 - Start another HMS for the Hive cluster in the container with port 19083. This is to test whether Kerberos authentication works for a Kerberos-enabled Hive cluster with multiple HMS. - Refresh ssh keys in the startup script. - Add test logic to log in localhost via ssh without password. -- gravitino-ci-kerberos-hive:0.1.4 +- datastrato/gravitino-ci-kerberos-hive:0.1.4 - Increase the total check time for the status of DataNode to 150s. - Output the log of the DataNode fails to start -- gravitino-ci-kerberos-hive:0.1.3 +- datastrato/gravitino-ci-kerberos-hive:0.1.3 - Add more proxy users in the core-site.xml file. - fix bugs in the `start.sh` script. -- gravitino-ci-kerberos-hive:0.1.2 +- datastrato/gravitino-ci-kerberos-hive:0.1.2 - Add `${HOSTNAME} >> /root/.ssh/known_hosts` to the startup script. - Add check for the status of DataNode, if the DataNode is not running or ready within 100s, the container will exit. -- gravitino-ci-kerberos-hive:0.1.1 +- datastrato/gravitino-ci-kerberos-hive:0.1.1 - Add a principal for Gravitino web server named 'HTTP/localhost@HADOOPKRB'. - Fix bugs about the configuration of proxy users. -- gravitino-ci-kerberos-hive:0.1.0 +- datastrato/gravitino-ci-kerberos-hive:0.1.0 - Set up a Hive cluster with kerberos enabled. - Install a KDC server and create a principal for Hive. For more please see [kerberos-hive](../dev/docker/kerberos-hive) @@ -143,7 +143,7 @@ You can use this kind of image to test the catalog of Apache Hive. Changelog -- gravitino-ci-hive:0.1.13 +- datastrato/gravitino-ci-hive:0.1.13 - Support Hive 2.3.9 and HDFS 2.7.3 - Docker environment variables: - `HIVE_RUNTIME_VERSION`: `hive2` (default) @@ -157,57 +157,57 @@ Changelog - If you want to enable HDFS Ranger plugin, you need both set the `RANGER_SERVER_URL` and `RANGER_HDFS_REPOSITORY_NAME` environment variables. HDFS Ranger audit logs are stored in the `/usr/local/hadoop/logs/ranger-hdfs-audit.log` - Example: docker run -e HIVE_RUNTIME_VERSION='hive3' -e RANGER_SERVER_URL='http://ranger-server:6080' -e RANGER_HIVE_REPOSITORY_NAME='hiveDev' -e RANGER_HDFS_REPOSITORY_NAME='hdfsDev' ... datastrato/gravitino-ci-hive:0.1.13 -- gravitino-ci-hive:0.1.12 +- datastrato/gravitino-ci-hive:0.1.12 - Shrink hive Docker image size by 420MB -- gravitino-ci-hive:0.1.11 +- datastrato/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. -- gravitino-ci-hive:0.1.10 +- datastrato/gravitino-ci-hive:0.1.10 - Remove SSH service from the startup script. - Use `hadoop-daemon.sh` to start HDFS services. -- gravitino-ci-hive:0.1.9 +- datastrato/gravitino-ci-hive:0.1.9 - Remove cache after installing packages. -- gravitino-ci-hive:0.1.8 +- datastrato/gravitino-ci-hive:0.1.8 - Change the value of `hive.server2.enable.doAs` to `true` -- gravitino-ci-hive:0.1.7 +- datastrato/gravitino-ci-hive:0.1.7 - Download MySQL JDBC driver before building the Docker image - Set `hdfs` as HDFS superuser group -- gravitino-ci-hive:0.1.6 +- datastrato/gravitino-ci-hive:0.1.6 - No starting YARN when container startup - Removed expose ports: - `22` SSH - `8088` YARN Service -- gravitino-ci-hive:0.1.5 +- datastrato/gravitino-ci-hive:0.1.5 - Rollback `Map container hostname to 127.0.0.1 before starting Hadoop` of `datastrato/gravitino-ci-hive:0.1.4` -- gravitino-ci-hive:0.1.4 +- datastrato/gravitino-ci-hive:0.1.4 - Configure HDFS DataNode data transfer address to be `0.0.0.0:50010` - Map the container hostname to `127.0.0.1` before starting Hadoop - Expose `50010` port for the HDFS DataNode -- gravitino-ci-hive:0.1.3 +- datastrato/gravitino-ci-hive:0.1.3 - Change MySQL bind-address from `127.0.0.1` to `0.0.0.0` - Add `iceberg` to MySQL users with password `iceberg` - Export `3306` port for MySQL -- gravitino-ci-hive:0.1.2 +- datastrato/gravitino-ci-hive:0.1.2 - Based on `datastrato/gravitino-ci-hive:0.1.1` - Modify `fs.defaultFS` from `local` to `0.0.0.0` in the `core-site.xml` file. - Expose `9000` port in the `Dockerfile` file. -- gravitino-ci-hive:0.1.1 +- datastrato/gravitino-ci-hive:0.1.1 - Based on `datastrato/gravitino-ci-hive:0.1.0` - Modify HDFS/YARN/HIVE `MaxPermSize` from `8GB` to `128MB` - Modify `HADOOP_HEAPSIZE` from `8192` to `128` -- gravitino-ci-hive:0.1.0 +- datastrato/gravitino-ci-hive:0.1.0 - Docker image `datastrato/gravitino-ci-hive:0.1.0` - `hadoop-2.7.3` - `hive-2.3.9` @@ -228,22 +228,22 @@ You can use this image to test Trino. Changelog -- gravitino-ci-trino:0.1.6 +- datastrato/gravitino-ci-trino:0.1.6 - Upgrade trino:426 to trino:435 -- gravitino-ci-trino:0.1.5 +- datastrato/gravitino-ci-trino:0.1.5 - Add check for the version of gravitino-trino-connector -- gravitino-ci-trino:0.1.4 +- datastrato/gravitino-ci-trino:0.1.4 - Change `-Xmx1G` to `-Xmx2G` in the config file `/etc/trino/jvm.config` -- gravitino-ci-trino:0.1.3 +- datastrato/gravitino-ci-trino:0.1.3 - Remove copy content in folder `gravitino-trino-connector` to plugin folder `/usr/lib/trino/plugin/gravitino` -- gravitino-ci-trino:0.1.2 +- datastrato/gravitino-ci-trino:0.1.2 - Copy JDBC driver 'mysql-connector-java' and 'postgres' to `/usr/lib/trino/iceberg/` folder -- gravitino-ci-trino:0.1.0 +- datastrato/gravitino-ci-trino:0.1.0 - Docker image `datastrato/gravitino-ci-trino:0.1.0` - Based on `trinodb/trino:426` and removed some unused plugins from it. - Expose ports: @@ -254,23 +254,27 @@ Changelog You can use this image to test Apache Doris. Changelog -- gravitino-ci-doris:0.1.5 + +- apache/gravitino:ci-doris-0.1.5 + - Use `datastrato/gravitino-ci-doris:0.1.5` Dockerfile to rebuild the image. + +- datastrato/gravitino-ci-doris:0.1.5 - Remove the chmod command in the Dockerfile to decrease the size of the Docker image. -- gravitino-ci-doris:0.1.4 +- datastrato/gravitino-ci-doris:0.1.4 - remove chmod in start.sh to accelerate the startup speed -- gravitino-ci-doris:0.1.3 +- datastrato/gravitino-ci-doris:0.1.3 - To adapt to the CI framework, don't exit container when start failed, logs are no longer printed to stdout. - Add `report_disk_state_interval_seconds` config to decrease report interval. -- gravitino-ci-doris:0.1.2 +- datastrato/gravitino-ci-doris:0.1.2 - Add a check for the status of Doris BE, add retry for adding BE nodes. -- gravitino-ci-doris:0.1.1 +- datastrato/gravitino-ci-doris:0.1.1 - Optimize `start.sh`, add disk space check before starting Doris, exit when FE or BE start failed, add log to stdout -- gravitino-ci-doris:0.1.0 +- datastrato/gravitino-ci-doris:0.1.0 - Docker image `datastrato/gravitino-ci-doris:0.1.0` - Start Doris BE & FE in one container - Please set table properties `"replication_num" = "1"` when creating a table in Doris, because the default replication number is 3, but the Doris container only has one BE. @@ -285,7 +289,10 @@ You can use this image to control Trino's permissions. Changelog -- gravitino-ci-ranger:0.1.1 +- apache/gravitino:ci-ranger-0.1.1 + - Use `datastrato/gravitino-ci-ranger:0.1.1` Dockerfile to rebuild the image. + +- datastrato/gravitino-ci-ranger:0.1.1 - Docker image datastrato/gravitino-ci-ranger:0.1.1 - Use `ranger-admin` release from `datastrato/apache-ranger:2.4.0` to build docker image. - Remove unnecessary hack in `start-ranger-service.sh`. @@ -297,7 +304,7 @@ Changelog - Clone the `Apache Ranger` project from GiHub and checkout the `2.4.0` release. - Create a remote debug configuration (`Use model classpath` = `EmbeddedServer`) in your IDE and connect to the Ranger admin container. -- gravitino-ci-ranger:0.1.0 +- datastrato/gravitino-ci-ranger:0.1.0 - Docker image `datastrato/gravitino-ci-ranger:0.1.0` - Support Apache Ranger 2.4.0 - Use environment variable `RANGER_PASSWORD` to set up Apache Ranger admin password, Please notice Apache Ranger Password should be minimum 8 characters with min one alphabet and one numeric. diff --git a/flink-connector/build.gradle.kts b/flink-connector/build.gradle.kts index a21dea4a1..e7f09ef2a 100644 --- a/flink-connector/build.gradle.kts +++ b/flink-connector/build.gradle.kts @@ -158,10 +158,6 @@ tasks.test { dependsOn(tasks.jar) dependsOn(":catalogs:catalog-hive:jar") - doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.13") - } - val init = project.extra.get("initIntegrationTest") as (Test) -> Unit init(this) } diff --git a/iceberg/iceberg-rest-server/build.gradle.kts b/iceberg/iceberg-rest-server/build.gradle.kts index b289c72ed..582c8b5e8 100644 --- a/iceberg/iceberg-rest-server/build.gradle.kts +++ b/iceberg/iceberg-rest-server/build.gradle.kts @@ -155,11 +155,6 @@ tasks.test { } else { dependsOn(tasks.jar) - doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.12") - environment("GRAVITINO_CI_KERBEROS_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-kerberos-hive:0.1.3") - } - val init = project.extra.get("initIntegrationTest") as (Test) -> Unit init(this) } diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts index 630f16c68..3b2916904 100644 --- a/integration-test/build.gradle.kts +++ b/integration-test/build.gradle.kts @@ -159,13 +159,6 @@ tasks.test { dependsOn(":catalogs:catalog-kafka:jar", ":catalogs:catalog-kafka:runtimeJars") doFirst { - // Gravitino CI Docker image - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.13") - 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.5") - environment("GRAVITINO_CI_RANGER_DOCKER_IMAGE", "datastrato/gravitino-ci-ranger:0.1.1") - copy { from("${project.rootDir}/dev/docker/trino/conf") into("build/trino-conf") diff --git a/spark-connector/spark-common/build.gradle.kts b/spark-connector/spark-common/build.gradle.kts index f4dacc569..fd5aac6b6 100644 --- a/spark-connector/spark-common/build.gradle.kts +++ b/spark-connector/spark-common/build.gradle.kts @@ -142,10 +142,6 @@ tasks.test { } else { dependsOn(tasks.jar) - doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.13") - } - val init = project.extra.get("initIntegrationTest") as (Test) -> Unit init(this) } diff --git a/spark-connector/v3.3/spark/build.gradle.kts b/spark-connector/v3.3/spark/build.gradle.kts index fb3743c2a..79694deb8 100644 --- a/spark-connector/v3.3/spark/build.gradle.kts +++ b/spark-connector/v3.3/spark/build.gradle.kts @@ -157,10 +157,6 @@ tasks.test { dependsOn(":catalogs:catalog-hive:jar") dependsOn(":iceberg:iceberg-rest-server:jar") - doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.13") - } - val init = project.extra.get("initIntegrationTest") as (Test) -> Unit init(this) } diff --git a/spark-connector/v3.4/spark/build.gradle.kts b/spark-connector/v3.4/spark/build.gradle.kts index 74dc6d4fe..db6cf9964 100644 --- a/spark-connector/v3.4/spark/build.gradle.kts +++ b/spark-connector/v3.4/spark/build.gradle.kts @@ -157,10 +157,6 @@ tasks.test { dependsOn(":catalogs:catalog-hive:jar") dependsOn(":iceberg:iceberg-rest-server:jar") - doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.13") - } - val init = project.extra.get("initIntegrationTest") as (Test) -> Unit init(this) } diff --git a/spark-connector/v3.5/spark/build.gradle.kts b/spark-connector/v3.5/spark/build.gradle.kts index 907a847cd..3fdef819d 100644 --- a/spark-connector/v3.5/spark/build.gradle.kts +++ b/spark-connector/v3.5/spark/build.gradle.kts @@ -159,10 +159,6 @@ tasks.test { dependsOn(":catalogs:catalog-hive:jar") dependsOn(":iceberg:iceberg-rest-server:jar") - doFirst { - environment("GRAVITINO_CI_HIVE_DOCKER_IMAGE", "datastrato/gravitino-ci-hive:0.1.13") - } - val init = project.extra.get("initIntegrationTest") as (Test) -> Unit init(this) }
