subject:"maven\-surefire git commit\: \[SUREFIRE\-1489\] Implement lock\(\) and zip\(\) in jenkinsfile \[Forced Update\!\]"

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-24 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 271742af8 -> 927272c79 (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/927272c7
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/927272c7
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/927272c7

Branch: refs/heads/SUREFIRE-1489
Commit: 927272c79db9c041658d86757b85a5ebf575de84
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Sun Feb 25 03:54:29 2018 +0100

--
 Jenkinsfile | 155 +++
 maven-failsafe-plugin/pom.xml   |   6 ++
 pom.xml |   8 ++
 surefire-booter/pom.xml |  13 ---
 surefire-its/pom.xml|   3 +
 surefire-its/src/test/resources/pom.xml |   6 ++
 6 files changed, 84 insertions(+), 107 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/927272c7/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..a02431a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,45 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
 final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def jdks = [7, 8, 9, 10] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] 
: [9, 10]
 
-final def cmd = ['mvn']
-final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+timestamps {
+//https://github.com/jacoco/jacoco/issues/629
+def boolean makeReports = os == 'linux' && 
indexOfMaven == mavens.size() - 1 && jdk == 9
+

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-24 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 7a52d2dfd -> 271742af8 (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/271742af
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/271742af
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/271742af

Branch: refs/heads/SUREFIRE-1489
Commit: 271742af88fb594b39cc7986ab7b5db0811dc7bb
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Sat Feb 24 23:35:25 2018 +0100

--
 Jenkinsfile | 155 +++
 maven-failsafe-plugin/pom.xml   |   6 ++
 pom.xml |   8 ++
 surefire-its/pom.xml|   3 +
 surefire-its/src/test/resources/pom.xml |   6 ++
 5 files changed, 84 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/271742af/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..a02431a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,45 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
 final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def jdks = [7, 8, 9, 10] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] 
: [9, 10]
 
-final def cmd = ['mvn']
-final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+timestamps {
+//https://github.com/jacoco/jacoco/issues/629
+def boolean makeReports = os == 'linux' && 
indexOfMaven == mavens.size() - 1 && jdk == 9
+def failsafeItPort = 8000 + 100 *

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-24 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 4f61ea3cb -> 7a52d2dfd (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7a52d2df
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7a52d2df
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7a52d2df

Branch: refs/heads/SUREFIRE-1489
Commit: 7a52d2dfd2e271a83246ee901329cad9160b8e3b
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Sat Feb 24 22:29:28 2018 +0100

--
 Jenkinsfile | 157 +++
 maven-failsafe-plugin/pom.xml   |   6 +
 pom.xml |   8 ++
 surefire-its/pom.xml|   3 +
 surefire-its/src/test/resources/pom.xml |   6 +
 5 files changed, 85 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7a52d2df/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..f8f8334 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,45 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
-final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def mavens = ['3.5.x'] // env.BRANCH_NAME == 'master' ? ['3.2.x', 
'3.3.x', '3.5.x'] : ['3.5.x']
+final def jdks = [9] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] : [9, 10]
 
-final def cmd = ['mvn']
-final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+timestamps {
+//https://github.com/jacoco/jacoco/issues/629
+def boolean makeReports = os == 'linux' && 
indexOfMaven ==

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-24 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 7c601f354 -> 4f61ea3cb (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/4f61ea3c
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/4f61ea3c
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/4f61ea3c

Branch: refs/heads/SUREFIRE-1489
Commit: 4f61ea3cb7e91607132f931495604c66ac339841
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Sat Feb 24 22:17:24 2018 +0100

--
 Jenkinsfile | 159 +++
 maven-failsafe-plugin/pom.xml   |   6 +
 pom.xml |   8 ++
 surefire-its/pom.xml|   3 +
 surefire-its/src/test/resources/pom.xml |   6 +
 5 files changed, 85 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f61ea3c/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..76cc846 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,45 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
-final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def mavens = ['3.5.x'] // env.BRANCH_NAME == 'master' ? ['3.2.x', 
'3.3.x', '3.5.x'] : ['3.5.x']
+final def jdks = [9] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] : [9, 10]
 
-final def cmd = ['mvn']
-final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its', '-DskipTests']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+timestamps {
+//https://github.com/jacoco/jacoco/issues/629
+def boolean makeReports = os == 'linux' &&

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-24 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 bf6eefc66 -> 7c601f354 (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7c601f35
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7c601f35
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7c601f35

Branch: refs/heads/SUREFIRE-1489
Commit: 7c601f35464521811e6995fb04c84be2224aa6f3
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Sat Feb 24 22:11:30 2018 +0100

--
 Jenkinsfile | 159 +++
 maven-failsafe-plugin/pom.xml   |   6 +
 pom.xml |   8 ++
 surefire-its/pom.xml|   3 +
 surefire-its/src/test/resources/pom.xml |   6 +
 5 files changed, 85 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7c601f35/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..cfef718 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,45 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
-final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def mavens = ['3.5.x'] // env.BRANCH_NAME == 'master' ? ['3.2.x', 
'3.3.x', '3.5.x'] : ['3.5.x']
+final def jdks = [9] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] : [9, 10]
 
-final def cmd = ['mvn']
-final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its', '-DskipTests']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+timestamps {
+//https://github.com/jacoco/jacoco/issues/629
+def boolean makeReports = os == 'linux' &&

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-24 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 a83a75afd -> bf6eefc66 (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/bf6eefc6
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/bf6eefc6
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/bf6eefc6

Branch: refs/heads/SUREFIRE-1489
Commit: bf6eefc66f89cc1c33bc972d69d4457d1a04af2d
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Sat Feb 24 22:03:21 2018 +0100

--
 Jenkinsfile | 159 +++
 maven-failsafe-plugin/pom.xml   |   6 +
 pom.xml |   8 ++
 surefire-its/pom.xml|   3 +
 surefire-its/src/test/resources/pom.xml |   6 +
 5 files changed, 85 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bf6eefc6/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..f693a30 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,45 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
-final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def mavens = ['3.5.x'] // env.BRANCH_NAME == 'master' ? ['3.2.x', 
'3.3.x', '3.5.x'] : ['3.5.x']
+final def jdks = [9] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] : [9, 10]
 
-final def cmd = ['mvn']
-final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its', '-DskipTests']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+timestamps {
+//https://github.com/jacoco/jacoco/issues/629
+def boolean makeReports = os == 'linux' &&

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-24 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 6ae2fd7ec -> a83a75afd (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/a83a75af
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/a83a75af
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/a83a75af

Branch: refs/heads/SUREFIRE-1489
Commit: a83a75afde82a93b0e2830725d32c622498cee7f
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Sat Feb 24 18:05:39 2018 +0100

--
 Jenkinsfile | 150 +++
 pom.xml |   8 ++
 surefire-its/pom.xml|   3 +
 surefire-its/src/test/resources/pom.xml |   6 ++
 4 files changed, 101 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a83a75af/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..d58dc59 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,44 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
 final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def jdks = [7, 8, 9, 10] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] 
: [9, 10]
 
-final def cmd = ['mvn']
-final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def options = ['-e', '-V', '-B', '-nsu']
+final def optionsIT = ['-pl', 'maven-failsafe-plugin', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
+
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+timestamps {
+//https://github.com/jacoco/jacoco/issues/629
+def boolean makeReports = os == 'linux' && 
indexOfMaven == mavens.size() - 1 && jdk == 9
+buildProcess(stageKey, jdkName,

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-24 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 314870f98 -> 6ae2fd7ec (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/6ae2fd7e
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/6ae2fd7e
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/6ae2fd7e

Branch: refs/heads/SUREFIRE-1489
Commit: 6ae2fd7ecf16d094f200f0f6af7d4e5dc9180a7d
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Sat Feb 24 17:34:49 2018 +0100

--
 Jenkinsfile | 144 +++
 pom.xml |   8 ++
 surefire-its/pom.xml|   3 +
 surefire-its/src/test/resources/pom.xml |   6 ++
 4 files changed, 95 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/6ae2fd7e/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..201d0ec 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,44 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
 final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def jdks = [7, 8, 9, 10] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] 
: [9, 10]
 
-final def cmd = ['mvn']
-final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def options = ['-e', '-V', '-B', '-nsu']
+final def optionsIT = ['-pl', 'maven-failsafe-plugin', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
+
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+timestamps {
+//https://github.com/jacoco/jacoco/issues/629
+def boolean makeReports = os == 'linux' && 
indexOfMaven == mavens.size() - 1 && jdk == 9
+buildProcess(stageKey, jdkName,

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-23 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 1f64fb2f6 -> 314870f98 (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/314870f9
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/314870f9
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/314870f9

Branch: refs/heads/SUREFIRE-1489
Commit: 314870f985f391d0d0a19021dd6379a28947dd7b
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Sat Feb 24 02:34:55 2018 +0100

--
 Jenkinsfile | 138 ++-
 pom.xml |   8 ++
 surefire-its/pom.xml|   3 +
 surefire-its/src/test/resources/pom.xml |   6 ++
 4 files changed, 87 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/314870f9/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..1b4a7c6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,48 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
 final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def jdks = [7, 8, 9, 10] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] 
: [9, 10]
 
-final def cmd = ['mvn']
-final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def options = ['-e', '-V', '-B', '-nsu']
+final def optionsIT = ['-pl', 'maven-failsafe-plugin', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
+
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+timestamps {
+if (os == 'linux') {
+//https://github.com/jacoco/jacoco/issues/629
+boolean makeReports = indexOfMaven == 
mavens.size() - 1 && jdk == 9
+

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-23 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 4bda0591b -> 1f64fb2f6 (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/1f64fb2f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1f64fb2f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1f64fb2f

Branch: refs/heads/SUREFIRE-1489
Commit: 1f64fb2f6121622ffd9341a8b1fc074cbe4dfa16
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Fri Feb 23 19:23:02 2018 +0100

--
 Jenkinsfile | 138 ++-
 pom.xml |   8 ++
 surefire-its/pom.xml|   3 +
 surefire-its/src/test/resources/pom.xml |   6 ++
 4 files changed, 88 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1f64fb2f/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..7c4f7de 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,50 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
 final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def jdks = [7, 8, 9, 10] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] 
: [9, 10]
 
-final def cmd = ['mvn']
 final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def optionsIT = ['-pl', 'maven-failsafe-plugin', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
+
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+ansiColor('xterm') {
+timestamps {
+if (os == 'linux') {
+//https://github.com/jacoco/jacoco/issues/629
+boolean makeReports = indexOfMaven == 
mavens.size() - 1 && jdk == 9
+

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-23 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 e168042c9 -> 4bda0591b (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/4bda0591
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/4bda0591
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/4bda0591

Branch: refs/heads/SUREFIRE-1489
Commit: 4bda0591bc19a476eba283b1ec587094ed1a0d49
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Fri Feb 23 09:55:19 2018 +0100

--
 Jenkinsfile | 138 ---
 1 file changed, 71 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4bda0591/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..9ebe630 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,50 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
 final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def jdks = [7, 8, 9, 10] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] 
: [9, 10]
 
-final def cmd = ['mvn']
 final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def optionsIT = ['-pl', 'maven-failsafe-plugin', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
+
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+ansiColor('xterm') {
+timestamps {
+if (os == 'linux') {
+//https://github.com/jacoco/jacoco/issues/629
+boolean makeReports = indexOfMaven == 
mavens.size() - 1 && jdk == 9
+buildProcess(stageKey, jdkName, jdkTestName, 
mvnName, goals, options, optionsIT, mavenOpts, makeReports)
+}

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-22 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 745fd0187 -> e168042c9 (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e168042c
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e168042c
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e168042c

Branch: refs/heads/SUREFIRE-1489
Commit: e168042c94baaad70c7c93acca6a4aacdb1b57c5
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Fri Feb 23 06:15:21 2018 +0100

--
 Jenkinsfile | 138 ---
 1 file changed, 71 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e168042c/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..a15ace4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,50 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
-final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : 
['3.5.x']
+final def jdks = env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] : [9, 10]
 
-final def cmd = ['mvn']
 final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def optionsIT = ['-pl', 'maven-failsafe-plugin', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
+
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+ansiColor('xterm') {
+timestamps {
+if (os == 'linux') {
+//https://github.com/jacoco/jacoco/issues/629
+boolean makeReports = indexOfMaven == 
mavens.size() - 1 && jdk == 9
+buildProcess(stageKey, jdkName, jdkTestName, 
mvnName, goals,

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-22 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 63b3cf335 -> 745fd0187 (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/745fd018
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/745fd018
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/745fd018

Branch: refs/heads/SUREFIRE-1489
Commit: 745fd0187ff4716cbbddd022e240fb3cc475bf59
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Fri Feb 23 06:10:00 2018 +0100

--
 Jenkinsfile | 138 ---
 1 file changed, 71 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/745fd018/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..32504e1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,50 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
-final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : 
['3.5.x']
+final def jdks = env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] : [9, 10]
 
-final def cmd = ['mvn']
 final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def optionsIT = ['-pl', 'maven-failsafe-plugin', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
+
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+ansiColor('xterm') {
+timestamps {
+if (os == 'linux') {
+//https://github.com/jacoco/jacoco/issues/629
+boolean makeReports = indexOfMaven == 
mavens.size() - 1 && jdk == 9
+buildProcess(stageKey, jdkName, jdkTestName, 
mvnName, goals,

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-22 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 722868dc4 -> 63b3cf335 (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/63b3cf33
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/63b3cf33
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/63b3cf33

Branch: refs/heads/SUREFIRE-1489
Commit: 63b3cf33551266d5e679fbdf22c4255fc9ef88c0
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Fri Feb 23 06:03:55 2018 +0100

--
 Jenkinsfile | 137 ---
 1 file changed, 70 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/63b3cf33/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..8aab646 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,50 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
-final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : 
['3.5.x']
+final def jdks = env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] : [9, 10]
 
-final def cmd = ['mvn']
 final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def optionsIT = ['-pl', 'maven-failsafe-plugin', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
+
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+ansiColor('xterm') {
+timestamps {
+if (os == 'linux') {
+//https://github.com/jacoco/jacoco/issues/629
+boolean makeReports = indexOfMaven == 
mavens.size() - 1 && jdk == 9
+buildProcess(stageKey, jdkName, jdkTestName, 
mvnName, goals,

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

2018-02-22 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/SUREFIRE-1489 4725c1f97 -> 722868dc4 (forced update)


[SUREFIRE-1489] Implement lock() and zip() in jenkinsfile


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/722868dc
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/722868dc
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/722868dc

Branch: refs/heads/SUREFIRE-1489
Commit: 722868dc429d786659cce7ecbfa3343d8c68880c
Parents: d46556f
Author: Tibor17 
Authored: Fri Feb 23 05:39:47 2018 +0100
Committer: Tibor17 
Committed: Fri Feb 23 05:55:23 2018 +0100

--
 Jenkinsfile | 137 ---
 1 file changed, 70 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/722868dc/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 822bbc1..95d44a9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,42 +26,50 @@ properties(
 ]
 )
 
-final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
-final String WIN_LABEL = 'windows-2016-1'
-
 final def oses = ['linux', 'windows']
-final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' 
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', 
'8', '9', '10'] : ['10']
+final def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : 
['3.5.x']
+final def jdks = env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] : [9, 10]
 
-final def cmd = ['mvn']
 final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def optionsIT = ['-pl', 'maven-failsafe-plugin', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
 final Map stages = [:]
 
 oses.eachWithIndex { os, indexOfOs ->
-stages[os] = {
-mavens.eachWithIndex { maven, indexOfMaven ->
-jdks.eachWithIndex { jdk, indexOfJdk ->
-final String label = jenkinsEnv.labelForOS(os);
-final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
-final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
-final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+mavens.eachWithIndex { maven, indexOfMaven ->
+jdks.eachWithIndex { jdk, indexOfJdk ->
+final String label = jenkinsEnv.labelForOS(os);
+final String jdkTestName = jenkinsEnv.jdkFromVersion(os, 
jdk.toString())
+final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+final String stageKey = "${os}-jdk${jdk}-maven${maven}"
 
-if (label == null || jdkTestName == null || mvnName == null) {
-println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-return;
-}
+def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1 -XX:UseNUMA \
+-Xms64m -Djava.awt.headless=true'
+if (jdk > 7) {
+mavenOpts += ' -XX:+UseStringDeduplication'
+}
+mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
 
-println "${stageKey}  ==>  Label: ${label}, JDK: 
${jdkTestName}, Maven: ${mvnName}."
-if (os == 'windows') {
-node(WIN_LABEL) {
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, false)
-}
-} else {
-node(NIX_LABEL) {
-boolean makeReports = indexOfMaven == mavens.size() - 
1 && jdk == '9'
-buildProcess(stageKey, jdkName, jdkTestName, mvnName, 
cmd, options, goals, makeReports)
+if (label == null || jdkTestName == null || mvnName == null) {
+println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
+return;
+}
+
+println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
+
+stages[stageKey] = {
+node(label) {
+ansiColor('xterm') {
+timestamps {
+if (os == 'linux') {
+//https://github.com/jacoco/jacoco/issues/629
+boolean makeReports = indexOfMaven == 
mavens.size() - 1 && jdk == 9
+buildProcess(stageKey, jdkName, jdkTestName, 
mvnName, goals,

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

maven-surefire git commit: [SUREFIRE-1489] Implement lock() and zip() in jenkinsfile [Forced Update!]

15 matches

Site Navigation

Mail list logo

Footer information