This is an automated email from the ASF dual-hosted git repository.
gortiz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new faddaa1e9f Move coverage to its own profile
faddaa1e9f is described below
commit faddaa1e9f6e46afc12d669ebbcc3397e0289edd
Author: Robert Scholte <[email protected]>
AuthorDate: Wed Sep 18 12:46:39 2024 +0200
Move coverage to its own profile
This profile is enabled in GHA, but coverage won't be executed by default
---
.../pr-tests/.pinot_tests_custom_integration.sh | 2 +-
.../scripts/pr-tests/.pinot_tests_integration.sh | 4 +-
.../scripts/pr-tests/.pinot_tests_unit.sh | 6 +-
pinot-integration-tests/pom.xml | 23 ++++++++
pom.xml | 67 +++++++++-------------
5 files changed, 57 insertions(+), 45 deletions(-)
diff --git
a/.github/workflows/scripts/pr-tests/.pinot_tests_custom_integration.sh
b/.github/workflows/scripts/pr-tests/.pinot_tests_custom_integration.sh
index cd99615ce4..0de5d5fdc7 100755
--- a/.github/workflows/scripts/pr-tests/.pinot_tests_custom_integration.sh
+++ b/.github/workflows/scripts/pr-tests/.pinot_tests_custom_integration.sh
@@ -29,5 +29,5 @@ netstat -i
cd pinot-integration-tests || exit 1
if [ "$RUN_TEST_SET" == "1" ]; then
mvn test \
- -P github-actions,custom-cluster-integration-test-suite || exit 1
+ -P github-actions,codecoverage,custom-cluster-integration-test-suite ||
exit 1
fi
diff --git a/.github/workflows/scripts/pr-tests/.pinot_tests_integration.sh
b/.github/workflows/scripts/pr-tests/.pinot_tests_integration.sh
index a6f671c218..6ffea61c13 100755
--- a/.github/workflows/scripts/pr-tests/.pinot_tests_integration.sh
+++ b/.github/workflows/scripts/pr-tests/.pinot_tests_integration.sh
@@ -29,9 +29,9 @@ netstat -i
cd pinot-integration-tests || exit 1
if [ "$RUN_TEST_SET" == "1" ]; then
mvn test \
- -P github-actions,integration-tests-set-1 && exit 0 || exit 1
+ -P github-actions,codecoverage,integration-tests-set-1 && exit 0 || exit
1
fi
if [ "$RUN_TEST_SET" == "2" ]; then
mvn test \
- -P github-actions,integration-tests-set-2 && exit 0 || exit 1
+ -P github-actions,codecoverage,integration-tests-set-2 && exit 0 || exit
1
fi
diff --git a/.github/workflows/scripts/pr-tests/.pinot_tests_unit.sh
b/.github/workflows/scripts/pr-tests/.pinot_tests_unit.sh
index e50cdc93b6..562bbb2955 100755
--- a/.github/workflows/scripts/pr-tests/.pinot_tests_unit.sh
+++ b/.github/workflows/scripts/pr-tests/.pinot_tests_unit.sh
@@ -37,7 +37,7 @@ if [ "$RUN_TEST_SET" == "1" ]; then
-pl 'pinot-core' \
-pl 'pinot-query-planner' \
-pl 'pinot-query-runtime' \
- -P github-actions,no-integration-tests || exit 1
+ -P github-actions,codecoverage,no-integration-tests || exit 1
fi
if [ "$RUN_TEST_SET" == "2" ]; then
mvn test -T 16 \
@@ -48,5 +48,7 @@ if [ "$RUN_TEST_SET" == "2" ]; then
-pl '!pinot-query-planner' \
-pl '!pinot-query-runtime' \
-pl '!:pinot-yammer' \
- -P github-actions,no-integration-tests || exit 1
+ -P github-actions,codecoverage,no-integration-tests || exit 1
fi
+
+mvn jacoco:report-aggregate@report -P codecoverage || exit 1
diff --git a/pinot-integration-tests/pom.xml b/pinot-integration-tests/pom.xml
index cf1e2492ec..b5cc795920 100644
--- a/pinot-integration-tests/pom.xml
+++ b/pinot-integration-tests/pom.xml
@@ -36,6 +36,29 @@
</properties>
<profiles>
+ <profile>
+ <id>codecoverage</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>report</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>no-integration-tests</id>
<activation>
diff --git a/pom.xml b/pom.xml
index c1ff7fa742..6c3162c917 100644
--- a/pom.xml
+++ b/pom.xml
@@ -356,6 +356,31 @@
<argLine>-Xms4g -Xmx4g -Dlog4j2.configurationFile=log4j2.xml</argLine>
</properties>
</profile>
+ <profile>
+ <id>codecoverage</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <append>true</append>
+ <includes>
+ <include>org/apache/pinot/**/*</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<!-- Disable source release assembly for 'apache-release' profile. -->
<profile>
<id>apache-release</id>
@@ -2151,19 +2176,14 @@
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
- <id>enforce-dependency-convergence</id>
+ <id>default-cli</id> <!-- magic id, used when calling
enforcer:enforce -->
<goals>
<goal>enforce</goal>
</goals>
<phase>validate</phase>
- </execution>
- <execution>
- <id>enforce-banned-dependencies</id>
- <goals>
- <goal>enforce</goal>
- </goals>
<configuration>
<rules>
+ <dependencyConvergence />
<bannedDependencies>
<excludes>
<!-- Use org.slf4j:jcl-over-slf4j -->
@@ -2186,15 +2206,9 @@
</excludes>
</bannedDependencies>
</rules>
- <fail>true</fail> <!-- Fail the build if banned dependencies
are found -->
</configuration>
</execution>
</executions>
- <configuration>
- <rules>
- <dependencyConvergence />
- </rules>
- </configuration>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
@@ -2462,33 +2476,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>report</id>
- <phase>test</phase>
- <goals>
- <goal>report-aggregate</goal>
- </goals>
- <configuration>
- <includeCurrentProject>true</includeCurrentProject>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <append>true</append>
- <includes>
- <include>org/apache/pinot/**/*</include>
- </includes>
- </configuration>
- </plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
