Skip to content

Commit

Permalink
HSEARCH-5094 Re-execute jacoco-prepare once per surefire/failsafe exe…
Browse files Browse the repository at this point in the history 
…cution

So that executions won't share the same jacoco.exec file and Develocity
will be able to cache it, along with tests.
  • Loading branch information
@yrodiere
yrodiere committed Mar 1, 2024
1 parent afc717e commit c973d28
Show file tree
Hide file tree
Showing 6 changed files with 231 additions and 3 deletions.
38 changes: 38 additions & 0 deletions documentation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,42 @@
<showDeprecation>false</showDeprecation>
</configuration>
</plugin>
<!-- We need to send the jacoco report of each test execution to a different file,
otherwise Develocity won't be able to cache test executions. -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>jacoco-prepare-agent-integration</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-lucene</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.lucene</propertyName>
<destFile>${project.build.directory}/lucene/jacoco.exec</destFile>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-elasticsearch</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.elasticsearch</propertyName>
<destFile>${project.build.directory}/elasticsearch/jacoco.exec</destFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Expand All @@ -127,6 +163,7 @@
</goals>
<configuration>
<skip>${test.lucene.skip}</skip>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.lucene}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-lucene</reportNameSuffix>
<reportsDirectory>${failsafe.lucene.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.lucene.summaryFile}</summaryFile>
Expand All @@ -148,6 +185,7 @@
</goals>
<configuration>
<skip>${test.elasticsearch.skip}</skip>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.elasticsearch}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-elasticsearch</reportNameSuffix>
<reportsDirectory>${failsafe.elasticsearch.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.elasticsearch.summaryFile}</summaryFile>
Expand Down
62 changes: 62 additions & 0 deletions integrationtest/mapper/orm-jakarta-batch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,64 @@

<build>
<plugins>
<!-- We need to send the jacoco report of each test execution to a different file,
otherwise Develocity won't be able to cache test executions. -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>jacoco-prepare-agent-integration</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-lucene-jbatch</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.lucene-jbatch</propertyName>
<destFile>${project.build.directory}/lucene-jbatch/jacoco.exec</destFile>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-lucene-jberet</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.lucene-jberet</propertyName>
<destFile>${project.build.directory}/lucene-jberet/jacoco.exec</destFile>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-elasticsearch-jbatch</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.elasticsearch-jbatch</propertyName>
<destFile>${project.build.directory}/elasticsearch-jbatch/jacoco.exec</destFile>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-elasticsearch-jberet</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.elasticsearch-jberet</propertyName>
<destFile>${project.build.directory}/elasticsearch-jberet/jacoco.exec</destFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Expand All @@ -101,6 +159,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.lucene-jbatch}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-lucene-jbatch</reportNameSuffix>
<reportsDirectory>${failsafe.lucene-jbatch.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.lucene-jbatch.summaryFile}</summaryFile>
Expand All @@ -122,6 +181,7 @@
<goal>integration-test</goal>
</goals>
<configuration>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.lucene-jberet}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-lucene-jberet</reportNameSuffix>
<reportsDirectory>${failsafe.lucene-jberet.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.lucene-jberet.summaryFile}</summaryFile>
Expand All @@ -143,6 +203,7 @@
</goals>
<configuration>
<skip>${test.elasticsearch.skip}</skip>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.elasticsearch-jbatch}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-elasticsearch-jbatch</reportNameSuffix>
<reportsDirectory>${failsafe.elasticsearch-jbatch.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.elasticsearch-jbatch.summaryFile}</summaryFile>
Expand All @@ -165,6 +226,7 @@
</goals>
<configuration>
<skip>${test.elasticsearch.skip}</skip>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.elasticsearch-jberet}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-elasticsearch-jberet</reportNameSuffix>
<reportsDirectory>${failsafe.elasticsearch-jberet.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.elasticsearch-jberet.summaryFile}</summaryFile>
Expand Down
50 changes: 50 additions & 0 deletions integrationtest/mapper/orm-realbackend/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,53 @@

<build>
<plugins>
<!-- We need to send the jacoco report of each test execution to a different file,
otherwise Develocity won't be able to cache test executions. -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>jacoco-prepare-agent-integration</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-lucene</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.lucene</propertyName>
<destFile>${project.build.directory}/lucene/jacoco.exec</destFile>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-elasticsearch</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.elasticsearch</propertyName>
<destFile>${project.build.directory}/elasticsearch/jacoco.exec</destFile>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-multiplebackends</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.multiplebackends</propertyName>
<destFile>${project.build.directory}/multiplebackends/jacoco.exec</destFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Expand All @@ -85,6 +132,7 @@
</goals>
<configuration>
<skip>${test.lucene.skip}</skip>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.lucene}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-lucene</reportNameSuffix>
<reportsDirectory>${failsafe.lucene.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.lucene.summaryFile}</summaryFile>
Expand All @@ -108,6 +156,7 @@
</goals>
<configuration>
<skip>${test.elasticsearch.skip}</skip>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.elasticsearch}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-elasticsearch</reportNameSuffix>
<reportsDirectory>${failsafe.elasticsearch.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.elasticsearch.summaryFile}</summaryFile>
Expand All @@ -131,6 +180,7 @@
</goals>
<configuration>
<skip>${test.multiplebackends.skip}</skip>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.multiplebackends}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-multiplebackends</reportNameSuffix>
<reportsDirectory>${failsafe.multiplebackends.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.multiplebackends.summaryFile}</summaryFile>
Expand Down
38 changes: 38 additions & 0 deletions integrationtest/mapper/pojo-standalone-realbackend/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,42 @@

<build>
<plugins>
<!-- We need to send the jacoco report of each test execution to a different file,
otherwise Develocity won't be able to cache test executions. -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>jacoco-prepare-agent-integration</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-lucene</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.lucene</propertyName>
<destFile>${project.build.directory}/lucene/jacoco.exec</destFile>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-elasticsearch</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.elasticsearch</propertyName>
<destFile>${project.build.directory}/elasticsearch/jacoco.exec</destFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Expand All @@ -67,6 +103,7 @@
</goals>
<configuration>
<skip>${test.lucene.skip}</skip>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.lucene}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-lucene</reportNameSuffix>
<reportsDirectory>${failsafe.lucene.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.lucene.summaryFile}</summaryFile>
Expand All @@ -88,6 +125,7 @@
</goals>
<configuration>
<skip>${test.elasticsearch.skip}</skip>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.elasticsearch}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-elasticsearch</reportNameSuffix>
<reportsDirectory>${failsafe.elasticsearch.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.elasticsearch.summaryFile}</summaryFile>
Expand Down
38 changes: 38 additions & 0 deletions integrationtest/showcase/library/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,42 @@
</execution>
</executions>
</plugin>
<!-- We need to send the jacoco report of each test execution to a different file,
otherwise Develocity won't be able to cache test executions. -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>jacoco-prepare-agent-integration</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-lucene</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.lucene</propertyName>
<destFile>${project.build.directory}/lucene/jacoco.exec</destFile>
</configuration>
</execution>
<execution>
<id>jacoco-prepare-agent-integration-elasticsearch</id>
<phase>initialize</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>failsafe.jvm.args.jacoco.elasticsearch</propertyName>
<destFile>${project.build.directory}/elasticsearch/jacoco.exec</destFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Expand Down Expand Up @@ -151,6 +187,7 @@
</goals>
<configuration>
<skip>${test.lucene.skip}</skip>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.lucene}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-lucene</reportNameSuffix>
<reportsDirectory>${failsafe.lucene.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.lucene.summaryFile}</summaryFile>
Expand All @@ -167,6 +204,7 @@
</goals>
<configuration>
<skip>${test.elasticsearch.skip}</skip>
<argLine>${failsafe.jvm.args.no-jacoco} @{failsafe.jvm.args.jacoco.elasticsearch}</argLine>
<reportNameSuffix>${surefire.executionIdentifier}-elasticsearch</reportNameSuffix>
<reportsDirectory>${failsafe.elasticsearch.reportsDirectory}</reportsDirectory>
<summaryFile>${failsafe.elasticsearch.summaryFile}</summaryFile>
Expand Down

0 comments on commit c973d28

Please sign in to comment.