This is an automated email from the ASF dual-hosted git repository. vgalaxies pushed a commit to branch intro-pd-fin in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
commit 5cbff463f9f6aedb865c3ea567f16a88ff87d064 Author: VGalaxies <[email protected]> AuthorDate: Thu Apr 25 11:02:21 2024 +0800 adjust some confs --- .github/workflows/pd-store-ci.yml | 21 ++++++++ hugegraph-pd/hg-pd-test/pom.xml | 103 ++++++++++---------------------------- hugegraph-pd/pom.xml | 3 +- 3 files changed, 48 insertions(+), 79 deletions(-) diff --git a/.github/workflows/pd-store-ci.yml b/.github/workflows/pd-store-ci.yml index 25a54c122..df67b242b 100644 --- a/.github/workflows/pd-store-ci.yml +++ b/.github/workflows/pd-store-ci.yml @@ -44,10 +44,31 @@ jobs: cp $HOME/.m2/settings.xml /tmp/settings.xml mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: Package + run: | + mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp + - name: Run common test run: | mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-common-test + - name: Run core test + run: | + mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-core-test + + # The above tests do not require starting a PD instance. + - name: Prepare env and service + run: | + $TRAVIS_DIR/start-pd.sh + + - name: Run client test + run: | + mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test + + - name: Run rest test + run: | + mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-rest-test + - name: Upload coverage to Codecov uses: codecov/[email protected] with: diff --git a/hugegraph-pd/hg-pd-test/pom.xml b/hugegraph-pd/hg-pd-test/pom.xml index b8de18e2b..440346611 100644 --- a/hugegraph-pd/hg-pd-test/pom.xml +++ b/hugegraph-pd/hg-pd-test/pom.xml @@ -94,21 +94,42 @@ <version>${log4j2.version}</version> </dependency> + <dependency> + <groupId>org.apache.hugegraph</groupId> + <artifactId>hg-pd-grpc</artifactId> + <version>${revision}</version> + </dependency> + <dependency> + <groupId>org.apache.hugegraph</groupId> + <artifactId>hg-pd-common</artifactId> + <version>${revision}</version> + </dependency> <dependency> <groupId>org.apache.hugegraph</groupId> <artifactId>hg-pd-client</artifactId> <version>${revision}</version> </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.8.9</version> + <groupId>org.apache.hugegraph</groupId> + <artifactId>hg-pd-core</artifactId> + <version>${revision}</version> </dependency> <dependency> <groupId>org.apache.hugegraph</groupId> - <artifactId>hg-pd-grpc</artifactId> + <artifactId>hg-pd-service</artifactId> + <version>${revision}</version> + </dependency> + <dependency> + <groupId>org.apache.hugegraph</groupId> + <artifactId>hg-pd-dist</artifactId> <version>${revision}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.8.9</version> </dependency> <dependency> <groupId>commons-io</groupId> @@ -131,28 +152,6 @@ <version>2.13.0</version> </dependency> - - <!--dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>4.9.0</version> - - </dependency> - - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.7.4</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.7.4</version> - <scope>test</scope> - </dependency--> - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> @@ -164,40 +163,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.hugegraph</groupId> - <artifactId>hg-pd-common</artifactId> - <version>${revision}</version> - </dependency> - <dependency> - <groupId>org.apache.hugegraph</groupId> - <artifactId>hg-pd-core</artifactId> - <version>${revision}</version> - </dependency> - <dependency> - <groupId>org.apache.hugegraph</groupId> - <artifactId>hg-pd-dist</artifactId> - <version>${revision}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hugegraph</groupId> - <artifactId>hg-pd-service</artifactId> - <version>${revision}</version> - </dependency> - <!--dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.7.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.7.4</version> - <scope>compile</scope> - </dependency--> - <dependency> <groupId>org.powermock</groupId> @@ -226,10 +191,8 @@ <version>2.0.0-RC.3</version> <scope>compile</scope> </dependency> - </dependencies> - <build> <plugins> <plugin> @@ -261,18 +224,6 @@ </includes> </configuration> </execution> - <execution> - <id>pd-cli-tools-test</id> - <configuration> - <testSourceDirectory>${basedir}/src/main/java/ - </testSourceDirectory> - <testClassesDirectory>${basedir}/target/classes/ - </testClassesDirectory> - <includes> - <include>**/CliToolsSuiteTest.java</include> - </includes> - </configuration> - </execution> <execution> <id>pd-common-test</id> <configuration> @@ -337,7 +288,6 @@ <exclude>org/apache/hugegraph/pd/grpc/**/*.class</exclude> <exclude>org/apache/hugegraph/pd/raft/*.class</exclude> <exclude>**/RaftKVStore.class</exclude> - </excludes> </configuration> </plugin> @@ -349,5 +299,4 @@ </resource> </resources> </build> - </project> diff --git a/hugegraph-pd/pom.xml b/hugegraph-pd/pom.xml index af0ca2232..716f067b8 100644 --- a/hugegraph-pd/pom.xml +++ b/hugegraph-pd/pom.xml @@ -38,8 +38,7 @@ <module>hg-pd-test</module> <module>hg-pd-core</module> <module>hg-pd-service</module> - <!-- TODO: uncomment later --> - <!-- <module>hg-pd-dist</module> --> + <module>hg-pd-dist</module> </modules> <properties>
