slawekjaranowski commented on code in PR #815:
URL: https://github.com/apache/maven-surefire/pull/815#discussion_r2004914455
##########
Jenkinsfile:
##########
@@ -21,19 +21,18 @@
properties(
[
- buildDiscarder(logRotator(artifactDaysToKeepStr: env.BRANCH_NAME ==
'master' ? '14' : '7',
- artifactNumToKeepStr: '50',
+ buildDiscarder(logRotator(artifactNumToKeepStr: env.BRANCH_NAME ==
'master' ? '15' : '5',
daysToKeepStr: env.BRANCH_NAME == 'master' ?
'30' : '14',
numToKeepStr: env.BRANCH_NAME == 'master' ?
'20' : '10')
- ),
- disableConcurrentBuilds()
+ )//,
+ //disableConcurrentBuilds()
]
)
// final def oses = ['linux':'ubuntu && maven', 'windows':'windows-he']
-final def oses = ['linux':'ubuntu && maven']
-final def mavens = env.BRANCH_NAME == 'master' ? ['3.x.x', '3.6.3'] : ['3.x.x']
+final def oses = ['linux':'ubuntu']
+final def mavens = env.BRANCH_NAME == 'master' ? ['3.x.x', '3.8.8'] : ['3.x.x']
Review Comment:
on GH action we have 3.6.3 still
##########
Jenkinsfile:
##########
@@ -134,7 +133,7 @@ def buildProcess(String stageKey, String jdkName, String
mvnName, goals, options
println "Maven Local Repository = ${mvnLocalRepoDir}."
assert mvnLocalRepoDir != null : 'Local Maven Repository is undefined.'
- def properties = ["-Djacoco.skip=${!makeReports}",
"\"-Dmaven.repo.local=${mvnLocalRepoDir}\""]
+ def properties = ["-Papache.ci -Djacoco.skip=${!makeReports}",
"\"-Dmaven.repo.local=${mvnLocalRepoDir}\""]
Review Comment:
If needed should be added in GH actions ...
##########
surefire-its/src/test/resources/surefire-1643-parallel-junit5/pom.xml:
##########
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit-platform-1.0.0</artifactId>
+ <version>1.0</version>
+ <name>[SUREFIRE-1643] JUnit 5: Parallel Test mixed</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
<junit.jupiter.execution.parallel.config.fixed.parallelism>3</junit.jupiter.execution.parallel.config.fixed.parallelism>
+
<junit.jupiter.execution.parallel.config.strategy>fixed</junit.jupiter.execution.parallel.config.strategy>
+
<junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
+
<junit.jupiter.execution.parallel.mode.classes.default>concurrent</junit.jupiter.execution.parallel.mode.classes.default>
+
<junit.jupiter.execution.parallel.mode.default>same_thread</junit.jupiter.execution.parallel.mode.default>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>5.9.1</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement><!-- lock down plugins versions to avoid using Maven
defaults (may be moved to parent pom) -->
+ <plugins>
+ <!-- clean lifecycle, see
https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle
-->
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.4.0</version>
+ </plugin>
+ <!-- default lifecycle, jar packaging: see
https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging
-->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.5.3-SNAPSHOT</version>
Review Comment:
Here should be current project version
##########
surefire-its/pom.xml:
##########
@@ -241,6 +242,13 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>apache.ci</id>
+ <properties>
+ <its.forkCount>0.4C</its.forkCount>
+ <its.threadCount>1</its.threadCount>
+ </properties>
+ </profile>
Review Comment:
maybe we can detect CI by some of commons environment variable like CI ...?
do we need this only on Jenkins?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
