This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch 1c1d_test in repository https://gitbox.apache.org/repos/asf/iotdb-client-go.git
commit 912b678f0b3bf191ce4e3b34e246bc87ebf376e8 Author: HTHou <[email protected]> AuthorDate: Mon Oct 24 22:45:13 2022 +0800 Use 1c1d docker to run go client IT --- Makefile | 8 +++++--- test/e2e/Dockerfile.iotdb-server | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 461311f..b5ea45b 100644 --- a/Makefile +++ b/Makefile @@ -48,9 +48,10 @@ test: go test -v ./client/... e2e_test: - sh -c "cd /tmp/ && rm -rf iotdb && git clone https://github.com/apache/iotdb.git && cd iotdb && mvn -Dmaven.test.skip=true package -am -pl server" + sh -c "cd /tmp/ && rm -rf iotdb && git clone https://github.com/apache/iotdb.git && cd iotdb && mvn clean package -pl distribution -am -DskipTests" mkdir -p target/iotdb - unzip -o -q /tmp/iotdb/server/target/iotdb-server-*.zip -d target/iotdb + unzip -o -q /tmp/iotdb/distribution/target/apache-iotdb-*-all-bin.zip -d target/iotdb + cp /tmp/iotdb/docker/src/main/DockerCompose/start-1c1d.sh target/iotdb/sbin docker-compose -f test/e2e/docker-compose.yml up --build --abort-on-container-exit --remove-orphans e2e_test_clean: @@ -60,7 +61,8 @@ e2e_test_clean: #only used for project structure that the iotdb main project is in the parent folder of this project. e2e_test_for_parent_git_repo: mkdir -p target/iotdb - unzip -o -q ../server/target/iotdb-server-*.zip -d target/iotdb + unzip -o -q ../distribution/target/apache-iotdb-*-all-bin.zip -d target/iotdb + cp /tmp/iotdb/docker/src/main/DockerCompose/start-1c1d.sh target/iotdb/sbin docker-compose -f test/e2e/docker-compose.yml up --build --abort-on-container-exit --remove-orphans e2e_test_clean_for_parent_git_repo: diff --git a/test/e2e/Dockerfile.iotdb-server b/test/e2e/Dockerfile.iotdb-server index 4d6a8ab..95e61cc 100644 --- a/test/e2e/Dockerfile.iotdb-server +++ b/test/e2e/Dockerfile.iotdb-server @@ -24,4 +24,4 @@ RUN apt update \ ADD target /usr/local WORKDIR /usr/local/iotdb EXPOSE 6667 -CMD [ "/usr/local/iotdb/sbin/start-server.sh" ] +CMD [ "/usr/local/iotdb/sbin/start-1c1d.sh" ]
