You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/01/25 21:51:39 UTC
[maven-surefire] 03/03: avoided 16 executors on Jenkins - only 2
Mvn x 4 JDKs = 8
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 1a186a10b6cb13c3eca4ef10f1ba0d5c069207af
Author: tibordigana <ti...@apache.org>
AuthorDate: Fri Jan 25 22:51:18 2019 +0100
avoided 16 executors on Jenkins - only 2 Mvn x 4 JDKs = 8
---
Jenkinsfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6d2016f..e593a0b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ properties(
)
final def oses = ['linux':'ubuntu && !H24', 'windows':'Windows']
-final def mavens = env.BRANCH_NAME == 'master' ? ['3.6.x', '3.5.x', '3.3.x', '3.2.x'] : ['3.6.x']
+final def mavens = env.BRANCH_NAME == 'master' ? ['3.6.x', '3.2.x'] : ['3.6.x']
// all non-EOL versions and the first EA
final def jdks = [12, 11, 8, 7]
@@ -56,7 +56,7 @@ oses.eachWithIndex { osMapping, indexOfOs ->
if (label == null || jdkTestName == null || mvnName == null) {
println "Skipping ${stageKey} as unsupported by Jenkins Environment."
- return;
+ return
}
println "${stageKey} ==> Label: ${label}, JDK: ${jdkTestName}, Maven: ${mvnName}."
@@ -118,7 +118,7 @@ timeout(time: 12, unit: 'HOURS') {
def buildProcess(String stageKey, String jdkName, String jdkTestName, String mvnName, goals, options, mavenOpts, boolean makeReports) {
cleanWs()
try {
- def mvnLocalRepoDir = null
+ def mvnLocalRepoDir
if (isUnix()) {
sh 'mkdir -p .m2'
mvnLocalRepoDir = "${pwd()}/.m2"