maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tibordig...@apache.org
Subject [maven-surefire] branch 3.0.0-M1-J7-PLEXUS updated: enabled JDK 11 and forking Jenkins workspace in Windows TEMP
Date Fri, 02 Nov 2018 11:34:53 GMT
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch 3.0.0-M1-J7-PLEXUS
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/3.0.0-M1-J7-PLEXUS by this push:
     new 3cf591a  enabled JDK 11 and forking Jenkins workspace in Windows TEMP
3cf591a is described below

commit 3cf591ad83ccaac44f60e65d009bc428ed0813c0
Author: Tibor17 <tibordigana@apache.org>
AuthorDate: Fri Nov 2 12:34:34 2018 +0100

    enabled JDK 11 and forking Jenkins workspace in Windows TEMP
---
 Jenkinsfile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 365035b..a9b7f78 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ properties(
 
 final def oses = ['linux':'ubuntu && !H24', 'windows':'Windows']
 final def mavens = env.BRANCH_NAME == 'master' ? ['3.5.x', '3.3.x', '3.2.x'] : ['3.5.x']
-final def jdks = [9, 8, 7]
+final def jdks = [11, 8, 7]
 
 final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
@@ -62,11 +62,14 @@ oses.eachWithIndex { osMapping, indexOfOs ->
 
             stages[stageKey] = {
                 node(label) {
-                    timestamps {
-                        def boolean makeReports = indexOfOs == 0 && indexOfMaven
== 0 && indexOfJdk == 0
-                        def failsafeItPort = 8000 + 100 * indexOfMaven + 10 * indexOfJdk
-                        def allOptions = options + ["-Dfailsafe-integration-test-port=${failsafeItPort}",
"-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"]
-                        buildProcess(stageKey, jdkName, jdkTestName, mvnName, goals, allOptions,
mavenOpts, makeReports)
+                    def wsDir = os == 'linux' ? pwd() : "$TEMP\\$BUILD_TAG"
+                    ws(wsDir) {
+                        timestamps {
+                            def boolean makeReports = indexOfOs == 0 && indexOfMaven
== 0 && indexOfJdk == 0
+                            def failsafeItPort = 8000 + 100 * indexOfMaven + 10 * indexOfJdk
+                            def allOptions = options + ["-Dfailsafe-integration-test-port=${failsafeItPort}",
"-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"]
+                            buildProcess(stageKey, jdkName, jdkTestName, mvnName, goals,
allOptions, mavenOpts, makeReports)
+                        }
                     }
                 }
             }


Mime
View raw message