Skip to content

Commit b2d4904

Browse files
slawekjaranowskiolamy
slawekjaranowski
and
olamy
authored
Fix jenkins build (#3314)
* Fix Jenkins build * relax timeout which makes test really flaky, we cannot guarantee a thread will make x operations in a given time Signed-off-by: Olivier Lamy <olamy@apache.org> * use recordCoverage * add JaCoCo reports * recordCoverage and ignoreParsingErrors * fix sourceDirectories * jacoco configuration * drop forkedProcessTimeoutInSeconds * use junit report in jenkins --------- Signed-off-by: Olivier Lamy <olamy@apache.org> Co-authored-by: Olivier Lamy <olamy@apache.org>
1 parent 41ce753 commit b2d4904

15 files changed

Lines changed: 81 additions & 138 deletions

File tree

‎Jenkinsfile‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ properties(
3232
final def oses = ['linux':'ubuntu']
3333
final def mavens = ['3.x.x']
3434
// all non-EOL versions and the first EA
35-
final def jdks = [21, 17, 11, 8]
35+
// final def jdks = [21, 17, 11, 8]
36+
final def jdks = [21]
3637

3738
final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
3839
final def goals = ['clean', 'install']
@@ -141,10 +142,13 @@ def buildProcess(String stageKey, String jdkName, String mvnName, goals, options
141142
} finally {
142143
try {
143144
if (makeReports) {
144-
jacoco(changeBuildStatus: false,
145-
execPattern: '**/target/jacoco*.exec',
146-
sourcePattern: sourcesPatternCsv(),
147-
classPattern: classPatternCsv())
145+
recordCoverage id: "coverage-${jdkName}", name: "Coverage ${jdkName}",
146+
tools: [
147+
[parser: 'JACOCO']
148+
],
149+
sourceCodeRetention: 'MODIFIED',
150+
sourceDirectories: [[path: '**/src/main/java']],
151+
ignoreParsingErrors: true
148152

149153
junit(healthScaleFactor: 0.0,
150154
allowEmptyResults: true,

‎maven-failsafe-plugin/pom.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,22 +145,27 @@
145145
<plugin>
146146
<groupId>org.jacoco</groupId>
147147
<artifactId>jacoco-maven-plugin</artifactId>
148-
<configuration>
149-
<propertyName>jacoco.agent</propertyName>
150-
</configuration>
151148
<executions>
152149
<execution>
153150
<id>jacoco-agent</id>
154151
<goals>
155152
<goal>prepare-agent</goal>
153+
<goal>prepare-agent-integration</goal>
154+
</goals>
155+
</execution>
156+
<execution>
157+
<id>jacoco-report</id>
158+
<goals>
159+
<goal>report-aggregate</goal>
156160
</goals>
161+
<phase>verify</phase>
157162
</execution>
158163
</executions>
159164
</plugin>
160165
<plugin>
161166
<artifactId>maven-surefire-plugin</artifactId>
162167
<configuration>
163-
<argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
168+
<argLine>${jvm.args.tests} @{argLine}</argLine>
164169
</configuration>
165170
<dependencies>
166171
<dependency>
@@ -299,6 +304,7 @@
299304
<integration-test-stop-port>${failsafe-integration-test-stop-port}</integration-test-stop-port>
300305
</properties>
301306
<debug>true</debug>
307+
<mavenOpts>@{argLine}</mavenOpts>
302308
</configuration>
303309
</execution>
304310
</executions>

‎maven-surefire-common/pom.xml‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -187,28 +187,11 @@
187187
<plugin>
188188
<groupId>org.jacoco</groupId>
189189
<artifactId>jacoco-maven-plugin</artifactId>
190-
<executions>
191-
<execution>
192-
<id>jacoco-instrumentation</id>
193-
<goals>
194-
<goal>instrument</goal>
195-
</goals>
196-
</execution>
197-
<execution>
198-
<id>restore-classes</id>
199-
<goals>
200-
<goal>restore-instrumented-classes</goal>
201-
</goals>
202-
</execution>
203-
</executions>
204190
</plugin>
205191
<plugin>
206192
<artifactId>maven-surefire-plugin</artifactId>
207193
<configuration>
208-
<argLine>${jvm.args.tests}</argLine>
209-
<systemPropertyVariables>
210-
<jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
211-
</systemPropertyVariables>
194+
<argLine>${jvm.args.tests} @{argLine}</argLine>
212195
</configuration>
213196
<dependencies>
214197
<dependency>

‎maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/E2ETest.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
import org.apache.maven.surefire.api.booter.Command;
4141
import org.apache.maven.surefire.api.event.Event;
4242
import org.apache.maven.surefire.api.fork.ForkNodeArguments;
43-
import org.apache.maven.surefire.api.report.OutputReportEntry;
44-
import org.apache.maven.surefire.api.report.TestOutputReceiver;
4543
import org.apache.maven.surefire.api.report.TestOutputReportEntry;
4644
import org.apache.maven.surefire.booter.spi.EventChannelEncoder;
4745
import org.apache.maven.surefire.booter.spi.SurefireMasterProcessChannelProcessorFactory;
@@ -123,12 +121,12 @@ public void handleEvent(@Nonnull Event event) {
123121
Thread t = new Thread() {
124122
@Override
125123
public void run() {
126-
TestOutputReceiver<OutputReportEntry> target = new TestOutputReceiver() {
127-
@Override
128-
public void writeTestOutput(OutputReportEntry reportEntry) {
129-
encoder.testOutput(stdOutln(reportEntry.getLog()));
130-
}
131-
};
124+
// TestOutputReceiver<OutputReportEntry> target = new TestOutputReceiver() {
125+
// @Override
126+
// public void writeTestOutput(OutputReportEntry reportEntry) {
127+
// encoder.testOutput(stdOutln(reportEntry.getLog()));
128+
// }
129+
// };
132130

133131
// PrintStream out = System.out;
134132
// PrintStream err = System.err;
@@ -164,9 +162,9 @@ public void writeTestOutput(OutputReportEntry reportEntry) {
164162
// 1.0 seconds while using the encoder/decoder
165163
assertThat(readTime.get())
166164
.describedAs("The performance test should assert 1.0 s of read time. "
167-
+ "The limit 10 s guarantees that the read time does not exceed this limit on overloaded CPU.")
165+
+ "The limit 30 s guarantees that the read time does not exceed this limit on overloaded CPU.")
168166
.isPositive()
169-
.isLessThanOrEqualTo(10_000L);
167+
.isLessThanOrEqualTo(30_000L);
170168
}
171169

172170
@Test

‎maven-surefire-plugin/pom.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,22 +90,20 @@
9090
<plugin>
9191
<groupId>org.jacoco</groupId>
9292
<artifactId>jacoco-maven-plugin</artifactId>
93-
<configuration>
94-
<propertyName>jacoco.agent</propertyName>
95-
</configuration>
9693
<executions>
9794
<execution>
98-
<id>jacoco-agent</id>
95+
<id>jacoco-report</id>
9996
<goals>
100-
<goal>prepare-agent</goal>
97+
<goal>report-aggregate</goal>
10198
</goals>
99+
<phase>verify</phase>
102100
</execution>
103101
</executions>
104102
</plugin>
105103
<plugin>
106104
<artifactId>maven-surefire-plugin</artifactId>
107105
<configuration>
108-
<argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
106+
<argLine>${jvm.args.tests} @{argLine}</argLine>
109107
</configuration>
110108
<dependencies>
111109
<dependency>

‎maven-surefire-report-plugin/pom.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,22 +205,20 @@
205205
<plugin>
206206
<groupId>org.jacoco</groupId>
207207
<artifactId>jacoco-maven-plugin</artifactId>
208-
<configuration>
209-
<propertyName>jacoco.agent</propertyName>
210-
</configuration>
211208
<executions>
212209
<execution>
213-
<id>jacoco-agent</id>
210+
<id>jacoco-report</id>
214211
<goals>
215-
<goal>prepare-agent</goal>
212+
<goal>report-aggregate</goal>
216213
</goals>
214+
<phase>verify</phase>
217215
</execution>
218216
</executions>
219217
</plugin>
220218
<plugin>
221219
<artifactId>maven-surefire-plugin</artifactId>
222220
<configuration>
223-
<argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
221+
<argLine>${jvm.args.tests} @{argLine}</argLine>
224222
<classpathDependencyExcludes>
225223
<classpathDependencyExclude>org.fusesource.jansi:jansi</classpathDependencyExclude>
226224
</classpathDependencyExcludes>

‎pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@
342342
<jmx>false</jmx>-->
343343
<formats>
344344
<format>HTML</format>
345+
<format>XML</format>
345346
</formats>
346347
<includes>
347348
<include>**/failsafe/*</include>
@@ -355,7 +356,22 @@
355356
<exclude>org/jacoco/**/*</exclude>
356357
<exclude>com/vladium/emma/rt/*</exclude>
357358
</excludes>
359+
<includeCurrentProject>true</includeCurrentProject>
358360
</configuration>
361+
<executions>
362+
<execution>
363+
<id>jacoco-agent</id>
364+
<goals>
365+
<goal>prepare-agent</goal>
366+
</goals>
367+
</execution>
368+
<execution>
369+
<id>jacoco-report</id>
370+
<goals>
371+
<goal>report</goal>
372+
</goals>
373+
</execution>
374+
</executions>
359375
</plugin>
360376
</plugins>
361377
</pluginManagement>

‎surefire-api/pom.xml‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,11 @@
7979
<plugin>
8080
<groupId>org.jacoco</groupId>
8181
<artifactId>jacoco-maven-plugin</artifactId>
82-
<configuration>
83-
<propertyName>jacoco.agent</propertyName>
84-
</configuration>
85-
<executions>
86-
<execution>
87-
<id>jacoco-agent</id>
88-
<goals>
89-
<goal>prepare-agent</goal>
90-
</goals>
91-
</execution>
92-
</executions>
9382
</plugin>
9483
<plugin>
9584
<artifactId>maven-surefire-plugin</artifactId>
9685
<configuration>
97-
<argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
86+
<argLine>${jvm.args.tests} @{argLine}</argLine>
9887
</configuration>
9988
<dependencies>
10089
<dependency>

‎surefire-booter/pom.xml‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -109,22 +109,11 @@
109109
<plugin>
110110
<groupId>org.jacoco</groupId>
111111
<artifactId>jacoco-maven-plugin</artifactId>
112-
<configuration>
113-
<propertyName>jacoco.agent</propertyName>
114-
</configuration>
115-
<executions>
116-
<execution>
117-
<id>jacoco-agent</id>
118-
<goals>
119-
<goal>prepare-agent</goal>
120-
</goals>
121-
</execution>
122-
</executions>
123112
</plugin>
124113
<plugin>
125114
<artifactId>maven-surefire-plugin</artifactId>
126115
<configuration>
127-
<argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
116+
<argLine>${jvm.args.tests} @{argLine}</argLine>
128117
<useFile>true</useFile>
129118
<redirectTestOutputToFile>true</redirectTestOutputToFile>
130119
</configuration>

‎surefire-extensions-api/pom.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@
7373
<plugin>
7474
<groupId>org.jacoco</groupId>
7575
<artifactId>jacoco-maven-plugin</artifactId>
76-
<configuration>
77-
<propertyName>jacoco.agent</propertyName>
78-
</configuration>
7976
<executions>
8077
<execution>
8178
<id>jacoco-agent</id>
@@ -88,7 +85,7 @@
8885
<plugin>
8986
<artifactId>maven-surefire-plugin</artifactId>
9087
<configuration>
91-
<argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
88+
<argLine>${jvm.args.tests} @{argLine}</argLine>
9289
</configuration>
9390
<dependencies>
9491
<dependency>

0 commit comments

Comments
 (0)