subject:"\[15\/50\] \[abbrv\] maven git commit\: Start using some of the jenkinsEnv stuff"

[15/50] [abbrv] maven git commit: Start using some of the jenkinsEnv stuff

2018-02-17 Thread khmarbaise

Start using some of the jenkinsEnv stuff


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

Branch: refs/heads/MNG-6069
Commit: 35f3586eccb1cd7bf3a6585aaa1aeb8f0cd0516b
Parents: 866582d
Author: Stephen Connolly 
Authored: Mon Dec 11 13:42:14 2017 +
Committer: Stephen Connolly 
Committed: Mon Dec 11 13:42:14 2017 +

--
 Jenkinsfile | 207 ++-
 1 file changed, 112 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/35f3586e/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 004abcb..39111e8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,12 +19,15 @@
 
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
 
+def buildOs = 'linux'
+def buildJdk = '7'
+def buildMvn = '3.5.0'
 def tests
 def CORE_IT_PROFILES='run-its,embedded'
 
 try {
 
-node('ubuntu') {
+node(jenkinsEnv.labelForOS(buildOs)) {
 dir('build') {
 stage('Checkout') {
 checkout scm
@@ -33,130 +36,144 @@ node('ubuntu') {
 def WORK_DIR=pwd()
 
 stage('Build / Unit Test') {
-def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
-echo "Driving build and unit tests using Maven $MAVEN_BUILD"
-def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
-echo "Running build and unit tests with Java $JAVA7_HOME"
-
-
withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
-sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
+String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn)
+withMaven(jdk: jdkName, maven: mvnName, 
mavenLocalRepo:"${WORK_DIR}/.repository", options:[
+artifactsPublisher(disabled: disablePublishers),
+junitPublisher(ignoreAttachments: false),
+findbugsPublisher(disabled: disablePublishers),
+openTasksPublisher(disabled: disablePublishers),
+dependenciesFingerprintPublisher(),
+invokerPublisher(),
+pipelineGraphPublisher()
+]) {
+sh "mvn clean verify -B -U -e -fae -V 
-maven.test.failure.ignore=true"
 }
-
 dir ('apache-maven/target') {
 sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
 stash includes: 'apache-maven-dist.zip', name: 'dist'
 }
-junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
 }
 
 tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', 
id: '_', remote: 
'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', 
traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 
'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
 }
 }
 
-stage 'Integration Test'
-parallel linuxJava7:{
-node('ubuntu') {
-def MAVEN_NIX_J7=tool name: 'Maven 3 (latest)', type: 
'hudson.tasks.Maven$MavenInstallation'
-echo "Driving integration tests using Maven $MAVEN_NIX_J7"
-def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
-echo "Running integration tests with Java $JAVA_NIX_J7"
 
-dir('test') {
-def WORK_DIR=pwd()
-checkout tests
-sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
-unstash 'dist'
-
withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) {
-sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+parallel linuxJava7:{
+node(jenkinsEnv.labelForOS('linux')) {
+stage ('Linux Java 7') {
+String jdkName = jenkinsEnv.jdkFromVersion('linux', '7')
+String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn)
+dir('test') {
+def WORK_DIR=pwd()
+checkout tests
+sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
+unstash

[15/50] [abbrv] maven git commit: Start using some of the jenkinsEnv stuff

2018-02-17 Thread khmarbaise

Start using some of the jenkinsEnv stuff


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

Branch: refs/heads/MNG-5868
Commit: 35f3586eccb1cd7bf3a6585aaa1aeb8f0cd0516b
Parents: 866582d
Author: Stephen Connolly 
Authored: Mon Dec 11 13:42:14 2017 +
Committer: Stephen Connolly 
Committed: Mon Dec 11 13:42:14 2017 +

--
 Jenkinsfile | 207 ++-
 1 file changed, 112 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/35f3586e/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 004abcb..39111e8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,12 +19,15 @@
 
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
 
+def buildOs = 'linux'
+def buildJdk = '7'
+def buildMvn = '3.5.0'
 def tests
 def CORE_IT_PROFILES='run-its,embedded'
 
 try {
 
-node('ubuntu') {
+node(jenkinsEnv.labelForOS(buildOs)) {
 dir('build') {
 stage('Checkout') {
 checkout scm
@@ -33,130 +36,144 @@ node('ubuntu') {
 def WORK_DIR=pwd()
 
 stage('Build / Unit Test') {
-def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
-echo "Driving build and unit tests using Maven $MAVEN_BUILD"
-def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
-echo "Running build and unit tests with Java $JAVA7_HOME"
-
-
withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
-sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
+String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn)
+withMaven(jdk: jdkName, maven: mvnName, 
mavenLocalRepo:"${WORK_DIR}/.repository", options:[
+artifactsPublisher(disabled: disablePublishers),
+junitPublisher(ignoreAttachments: false),
+findbugsPublisher(disabled: disablePublishers),
+openTasksPublisher(disabled: disablePublishers),
+dependenciesFingerprintPublisher(),
+invokerPublisher(),
+pipelineGraphPublisher()
+]) {
+sh "mvn clean verify -B -U -e -fae -V 
-maven.test.failure.ignore=true"
 }
-
 dir ('apache-maven/target') {
 sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
 stash includes: 'apache-maven-dist.zip', name: 'dist'
 }
-junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
 }
 
 tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', 
id: '_', remote: 
'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', 
traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 
'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
 }
 }
 
-stage 'Integration Test'
-parallel linuxJava7:{
-node('ubuntu') {
-def MAVEN_NIX_J7=tool name: 'Maven 3 (latest)', type: 
'hudson.tasks.Maven$MavenInstallation'
-echo "Driving integration tests using Maven $MAVEN_NIX_J7"
-def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
-echo "Running integration tests with Java $JAVA_NIX_J7"
 
-dir('test') {
-def WORK_DIR=pwd()
-checkout tests
-sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
-unstash 'dist'
-
withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) {
-sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+parallel linuxJava7:{
+node(jenkinsEnv.labelForOS('linux')) {
+stage ('Linux Java 7') {
+String jdkName = jenkinsEnv.jdkFromVersion('linux', '7')
+String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn)
+dir('test') {
+def WORK_DIR=pwd()
+checkout tests
+sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
+unstash

[15/50] [abbrv] maven git commit: Start using some of the jenkinsEnv stuff

2018-02-17 Thread khmarbaise

Start using some of the jenkinsEnv stuff


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

Branch: refs/heads/MNG-5227
Commit: 35f3586eccb1cd7bf3a6585aaa1aeb8f0cd0516b
Parents: 866582d
Author: Stephen Connolly 
Authored: Mon Dec 11 13:42:14 2017 +
Committer: Stephen Connolly 
Committed: Mon Dec 11 13:42:14 2017 +

--
 Jenkinsfile | 207 ++-
 1 file changed, 112 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/35f3586e/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 004abcb..39111e8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,12 +19,15 @@
 
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
 
+def buildOs = 'linux'
+def buildJdk = '7'
+def buildMvn = '3.5.0'
 def tests
 def CORE_IT_PROFILES='run-its,embedded'
 
 try {
 
-node('ubuntu') {
+node(jenkinsEnv.labelForOS(buildOs)) {
 dir('build') {
 stage('Checkout') {
 checkout scm
@@ -33,130 +36,144 @@ node('ubuntu') {
 def WORK_DIR=pwd()
 
 stage('Build / Unit Test') {
-def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
-echo "Driving build and unit tests using Maven $MAVEN_BUILD"
-def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
-echo "Running build and unit tests with Java $JAVA7_HOME"
-
-
withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
-sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
+String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn)
+withMaven(jdk: jdkName, maven: mvnName, 
mavenLocalRepo:"${WORK_DIR}/.repository", options:[
+artifactsPublisher(disabled: disablePublishers),
+junitPublisher(ignoreAttachments: false),
+findbugsPublisher(disabled: disablePublishers),
+openTasksPublisher(disabled: disablePublishers),
+dependenciesFingerprintPublisher(),
+invokerPublisher(),
+pipelineGraphPublisher()
+]) {
+sh "mvn clean verify -B -U -e -fae -V 
-maven.test.failure.ignore=true"
 }
-
 dir ('apache-maven/target') {
 sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
 stash includes: 'apache-maven-dist.zip', name: 'dist'
 }
-junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
 }
 
 tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', 
id: '_', remote: 
'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', 
traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 
'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
 }
 }
 
-stage 'Integration Test'
-parallel linuxJava7:{
-node('ubuntu') {
-def MAVEN_NIX_J7=tool name: 'Maven 3 (latest)', type: 
'hudson.tasks.Maven$MavenInstallation'
-echo "Driving integration tests using Maven $MAVEN_NIX_J7"
-def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
-echo "Running integration tests with Java $JAVA_NIX_J7"
 
-dir('test') {
-def WORK_DIR=pwd()
-checkout tests
-sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
-unstash 'dist'
-
withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) {
-sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+parallel linuxJava7:{
+node(jenkinsEnv.labelForOS('linux')) {
+stage ('Linux Java 7') {
+String jdkName = jenkinsEnv.jdkFromVersion('linux', '7')
+String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn)
+dir('test') {
+def WORK_DIR=pwd()
+checkout tests
+sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
+unstash

[15/50] [abbrv] maven git commit: Start using some of the jenkinsEnv stuff

2018-02-17 Thread khmarbaise

Start using some of the jenkinsEnv stuff


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

Branch: refs/heads/MNG-6164
Commit: 35f3586eccb1cd7bf3a6585aaa1aeb8f0cd0516b
Parents: 866582d
Author: Stephen Connolly 
Authored: Mon Dec 11 13:42:14 2017 +
Committer: Stephen Connolly 
Committed: Mon Dec 11 13:42:14 2017 +

--
 Jenkinsfile | 207 ++-
 1 file changed, 112 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/35f3586e/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 004abcb..39111e8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,12 +19,15 @@
 
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
 
+def buildOs = 'linux'
+def buildJdk = '7'
+def buildMvn = '3.5.0'
 def tests
 def CORE_IT_PROFILES='run-its,embedded'
 
 try {
 
-node('ubuntu') {
+node(jenkinsEnv.labelForOS(buildOs)) {
 dir('build') {
 stage('Checkout') {
 checkout scm
@@ -33,130 +36,144 @@ node('ubuntu') {
 def WORK_DIR=pwd()
 
 stage('Build / Unit Test') {
-def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
-echo "Driving build and unit tests using Maven $MAVEN_BUILD"
-def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
-echo "Running build and unit tests with Java $JAVA7_HOME"
-
-
withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
-sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
+String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn)
+withMaven(jdk: jdkName, maven: mvnName, 
mavenLocalRepo:"${WORK_DIR}/.repository", options:[
+artifactsPublisher(disabled: disablePublishers),
+junitPublisher(ignoreAttachments: false),
+findbugsPublisher(disabled: disablePublishers),
+openTasksPublisher(disabled: disablePublishers),
+dependenciesFingerprintPublisher(),
+invokerPublisher(),
+pipelineGraphPublisher()
+]) {
+sh "mvn clean verify -B -U -e -fae -V 
-maven.test.failure.ignore=true"
 }
-
 dir ('apache-maven/target') {
 sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
 stash includes: 'apache-maven-dist.zip', name: 'dist'
 }
-junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
 }
 
 tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', 
id: '_', remote: 
'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', 
traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 
'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
 }
 }
 
-stage 'Integration Test'
-parallel linuxJava7:{
-node('ubuntu') {
-def MAVEN_NIX_J7=tool name: 'Maven 3 (latest)', type: 
'hudson.tasks.Maven$MavenInstallation'
-echo "Driving integration tests using Maven $MAVEN_NIX_J7"
-def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
-echo "Running integration tests with Java $JAVA_NIX_J7"
 
-dir('test') {
-def WORK_DIR=pwd()
-checkout tests
-sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
-unstash 'dist'
-
withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) {
-sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+parallel linuxJava7:{
+node(jenkinsEnv.labelForOS('linux')) {
+stage ('Linux Java 7') {
+String jdkName = jenkinsEnv.jdkFromVersion('linux', '7')
+String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn)
+dir('test') {
+def WORK_DIR=pwd()
+checkout tests
+sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
+unstash

[15/50] [abbrv] maven git commit: Start using some of the jenkinsEnv stuff

[15/50] [abbrv] maven git commit: Start using some of the jenkinsEnv stuff

[15/50] [abbrv] maven git commit: Start using some of the jenkinsEnv stuff

[15/50] [abbrv] maven git commit: Start using some of the jenkinsEnv stuff

4 matches

Site Navigation

Mail list logo

Footer information