This is an automated email from the ASF dual-hosted git repository. jiajunwang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/helix.git
commit 10810a278549bffc2f621608e026367928822906 Author: Jiajun Wang <[email protected]> AuthorDate: Wed Apr 14 23:11:47 2021 -0700 Skip out-of-date tests in the Helix Merge CI test and generate code coverage report. This is for preparing the automatic continous code coverage report, which will be done in a separate change based on this PR. --- .github/workflows/Helix-CI.yml | 22 ++-------------------- helix-admin-webapp/pom.xml | 1 + helix-agent/pom.xml | 1 + pom.xml | 25 ++++++++++++++++++++++++- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.github/workflows/Helix-CI.yml b/.github/workflows/Helix-CI.yml index aa4ff40..44ca529 100644 --- a/.github/workflows/Helix-CI.yml +++ b/.github/workflows/Helix-CI.yml @@ -20,24 +20,6 @@ jobs: java-version: 1.8 - name: Build with Maven run: mvn clean install -Dmaven.test.skip.exec=true - - name: Test metrics-common - run: cd metrics-common; mvn -q test - if: ${{ success() || failure() }} - - name: Test metadata-store-directory-common - run: cd metadata-store-directory-common; mvn -q test - if: ${{ success() || failure() }} - - name: Test zookeeper-api - run: cd zookeeper-api; mvn -q test - if: ${{ success() || failure() }} - - name: Test helix-common - run: cd helix-common; mvn -q test - if: ${{ success() || failure() }} - - name: Test helix-lock - run: cd helix-lock; mvn -q test - if: ${{ success() || failure() }} - - name: Test helix-rest - run: cd helix-rest; mvn -q test - if: ${{ success() || failure() }} - - name: Test helix-core - run: cd helix-core; mvn -q test + - name: Run All Tests + run: mvn -q test if: ${{ success() || failure() }} diff --git a/helix-admin-webapp/pom.xml b/helix-admin-webapp/pom.xml index 7bb06da..6f2d341 100644 --- a/helix-admin-webapp/pom.xml +++ b/helix-admin-webapp/pom.xml @@ -42,6 +42,7 @@ * </osgi.import> <osgi.export>org.apache.helix.webapp*;version="${project.version};-noimport:=true</osgi.export> + <maven.test.skip>true</maven.test.skip> </properties> <dependencies> diff --git a/helix-agent/pom.xml b/helix-agent/pom.xml index daf14ee..53a572b 100644 --- a/helix-agent/pom.xml +++ b/helix-agent/pom.xml @@ -36,6 +36,7 @@ * </osgi.import> <osgi.export>org.apache.helix.agent*;version="${project.version};-noimport:=true</osgi.export> + <maven.test.skip>true</maven.test.skip> </properties> <dependencies> diff --git a/pom.xml b/pom.xml index a9f09be..c8feb30 100644 --- a/pom.xml +++ b/pom.xml @@ -749,7 +749,7 @@ See also: properties section and profiles section. --> <configuration> - <argLine>-Xms4096m -Xmx4096m</argLine> + <argLine>${argLine} -Xms4096m -Xmx4096m</argLine> <suiteXmlFiles> <suiteXmlFile>src/test/conf/testng.xml</suiteXmlFile> </suiteXmlFiles> @@ -777,6 +777,29 @@ </executions> <!-- Configuration for unit/integration tests section 2 of 3 (plugins) ENDS HERE. --> </plugin> + <!-- Code Coverage report generation --> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <!-- Skip this phase if unit tests are skipped --> + <skip>${maven.test.skip.exec}</skip> + </configuration> + </execution> + <execution> + <id>generate-code-coverage-report</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <reporting>
