[maven-surefire] 02/02: jenkinsfile: windows-2012-1||windows-2012-2||windows-2016-1

[ti...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

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

commit f8c08872d5dbff3316d35ded20794a8ffa5f7842
Author: Tibor17 <ti...@apache.org>
AuthorDate: Tue May 8 12:59:24 2018 +0200

    jenkinsfile: windows-2012-1||windows-2012-2||windows-2016-1
---
 Jenkinsfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5df67a0..c00a41e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,7 +30,7 @@ properties(
     ]
 )
 
-final def oses = ['linux', 'windows']
+final def oses = ['linux':'ubuntu', 'windows':'Windows && !windows-2012-3']
 final def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
 final def jdks = [7, 8, 9, 10]
 
@@ -38,10 +38,11 @@ final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
-oses.eachWithIndex { os, indexOfOs ->
+oses.eachWithIndex { osMapping, indexOfOs ->
     mavens.eachWithIndex { maven, indexOfMaven ->
         jdks.eachWithIndex { jdk, indexOfJdk ->
-            final String label = jenkinsEnv.labelForOS(os);
+            def os = osMapping.key
+            def label = osMapping.value
             final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk.toString())
             final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
             final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)

-- 
To stop receiving notification emails like this one, please contact
tibordigana@apache.org.