Supporting submodule of IoTDB, and keep consistent with the parent repo (#17)
* add makefile for run github action in submodule mode
* move docker temp folder to target
diff --git a/Makefile b/Makefile
index c4415f2..2808b27 100644
--- a/Makefile
+++ b/Makefile
@@ -49,10 +49,20 @@
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"
- mkdir -p docker-context/iotdb
- unzip -o -q /tmp/iotdb/server/target/iotdb-server-*.zip -d docker-context/iotdb
+ mkdir -p target/iotdb
+ unzip -o -q /tmp/iotdb/server/target/iotdb-server-*.zip -d target/iotdb
docker-compose -f test/e2e/docker-compose.yml up --build --abort-on-container-exit --remove-orphans
e2e_test_clean:
- rm -rf /tmp/iotdb docker-context
+ rm -rf /tmp/iotdb target
+ docker-compose -f test/e2e/docker-compose.yml down
+
+#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
+ docker-compose -f test/e2e/docker-compose.yml up --build --abort-on-container-exit --remove-orphans
+
+e2e_test_clean_for_parent_git_repo:
+ rm -rf target
docker-compose -f test/e2e/docker-compose.yml down
diff --git a/test/e2e/Dockerfile.iotdb-server b/test/e2e/Dockerfile.iotdb-server
index ed46745..4d6a8ab 100644
--- a/test/e2e/Dockerfile.iotdb-server
+++ b/test/e2e/Dockerfile.iotdb-server
@@ -21,7 +21,7 @@
RUN apt update \
&& apt install -y procps && apt clean
-ADD docker-context /usr/local
+ADD target /usr/local
WORKDIR /usr/local/iotdb
EXPOSE 6667
CMD [ "/usr/local/iotdb/sbin/start-server.sh" ]
