You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by yi...@apache.org on 2024/09/06 18:37:44 UTC
(hudi) branch branch-0.x updated: [HUDI-8067] Use exec to run the IT (#11903)
This is an automated email from the ASF dual-hosted git repository.
yihua pushed a commit to branch branch-0.x
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/branch-0.x by this push:
new 492baaf7737 [HUDI-8067] Use exec to run the IT (#11903)
492baaf7737 is described below
commit 492baaf77378a5b2519c55ab9889ed041d943a2a
Author: Jon Vexler <jb...@gmail.com>
AuthorDate: Fri Sep 6 14:37:38 2024 -0400
[HUDI-8067] Use exec to run the IT (#11903)
---
docker/setup_demo.sh | 6 +++---
docker/stop_demo.sh | 2 +-
hudi-integ-test/pom.xml | 51 +++++++++++++++++++++++--------------------------
3 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/docker/setup_demo.sh b/docker/setup_demo.sh
index e847f913a5a..d183086d26c 100755
--- a/docker/setup_demo.sh
+++ b/docker/setup_demo.sh
@@ -24,13 +24,13 @@ if [ "$HUDI_DEMO_ENV" = "--mac-aarch64" ]; then
COMPOSE_FILE_NAME="docker-compose_hadoop284_hive233_spark244_mac_aarch64.yml"
fi
# restart cluster
-HUDI_WS=${WS_ROOT} docker-compose -f ${SCRIPT_PATH}/compose/${COMPOSE_FILE_NAME} down
+HUDI_WS=${WS_ROOT} docker compose down -f ${SCRIPT_PATH}/compose/${COMPOSE_FILE_NAME}
if [ "$HUDI_DEMO_ENV" != "dev" ]; then
echo "Pulling docker demo images ..."
- HUDI_WS=${WS_ROOT} docker-compose -f ${SCRIPT_PATH}/compose/${COMPOSE_FILE_NAME} pull
+ HUDI_WS=${WS_ROOT} docker compose -f ${SCRIPT_PATH}/compose/${COMPOSE_FILE_NAME} pull
fi
sleep 5
-HUDI_WS=${WS_ROOT} docker-compose -f ${SCRIPT_PATH}/compose/${COMPOSE_FILE_NAME} up -d
+HUDI_WS=${WS_ROOT} docker compose up -f ${SCRIPT_PATH}/compose/${COMPOSE_FILE_NAME} -d
sleep 15
docker exec -it adhoc-1 /bin/bash /var/hoodie/ws/docker/demo/setup_demo_container.sh
diff --git a/docker/stop_demo.sh b/docker/stop_demo.sh
index 32a0e70c379..25fb8d82734 100755
--- a/docker/stop_demo.sh
+++ b/docker/stop_demo.sh
@@ -25,7 +25,7 @@ if [ "$HUDI_DEMO_ENV" = "--mac-aarch64" ]; then
COMPOSE_FILE_NAME="docker-compose_hadoop284_hive233_spark244_mac_aarch64.yml"
fi
# shut down cluster
-HUDI_WS=${WS_ROOT} docker-compose -f ${SCRIPT_PATH}/compose/${COMPOSE_FILE_NAME} down
+HUDI_WS=${WS_ROOT} docker compose down -f ${SCRIPT_PATH}/compose/${COMPOSE_FILE_NAME}
# remove houst mount directory
rm -rf /tmp/hadoop_data
diff --git a/hudi-integ-test/pom.xml b/hudi-integ-test/pom.xml
index ca1e719d2d4..49f165c0e5b 100644
--- a/hudi-integ-test/pom.xml
+++ b/hudi-integ-test/pom.xml
@@ -458,53 +458,50 @@
<outputFile>${dockerCompose.envFile}</outputFile>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.scalatest</groupId>
- <artifactId>scalatest-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.scalastyle</groupId>
- <artifactId>scalastyle-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.dkanejs.maven.plugins</groupId>
- <artifactId>docker-compose-maven-plugin</artifactId>
- <version>2.0.1</version>
- <executions>
<execution>
<id>up</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>up</goal>
+ <goal>exec</goal>
</goals>
<configuration>
<skip>${docker.compose.skip}</skip>
- <host>unix:///var/run/docker.sock</host>
- <composeFile>${dockerCompose.file}</composeFile>
- <detachedMode>true</detachedMode>
- <envFile>${dockerCompose.envFile}</envFile>
+ <executable>/bin/bash</executable>
+ <arguments>
+ <argument>-c</argument>
+ <argument>export HUDI_WS=`dirname ${project.basedir}`; docker compose -f ${dockerCompose.file} up -d</argument>
+ </arguments>
</configuration>
</execution>
<execution>
<id>down</id>
<phase>post-integration-test</phase>
<goals>
- <goal>down</goal>
+ <goal>exec</goal>
</goals>
<configuration>
<skip>${docker.compose.skip}</skip>
- <composeFile>${dockerCompose.file}</composeFile>
- <removeVolumes>true</removeVolumes>
+ <executable>/bin/bash</executable>
+ <arguments>
+ <argument>-c</argument>
+ <argument>export HUDI_WS=`dirname ${project.basedir}`; docker compose -f ${dockerCompose.file} down -v</argument>
+ </arguments>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.scalastyle</groupId>
+ <artifactId>scalastyle-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>