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/08/04 17:22:35 UTC
[maven] branch removed-java-tools-3 created (now 4ce4617)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch removed-java-tools-3
in repository https://gitbox.apache.org/repos/asf/maven.git.
at 4ce4617 temporarily commented out the jenkinsNotify()
This branch includes the following new commits:
new 1c72091 [MNG-6725] Skip '.mavenrc' via MAVEN_SKIP_RC=1 and '-Dmaven.skip.rc=true' on child ITs (by default on Jenkins CI).
new 82c6871 IT archives
new 16a4d30 core-its branch removed-java-tools-2
new 4ce4617 temporarily commented out the jenkinsNotify()
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 01/04: [MNG-6725] Skip '.mavenrc' via MAVEN_SKIP_RC=1 and
'-Dmaven.skip.rc=true' on child ITs (by default on Jenkins CI).
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch removed-java-tools-3
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 1c72091838e94b6f10d5ada2ab611f507654b8af
Author: tibordigana <ti...@apache.org>
AuthorDate: Tue Jul 30 11:52:43 2019 +0200
[MNG-6725] Skip '.mavenrc' via MAVEN_SKIP_RC=1 and '-Dmaven.skip.rc=true' on child ITs (by default on Jenkins CI).
(cherry picked from commit 93c88a2bd05bd1f318ad1174c2b3accdbe0cb36d)
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b9e510d..af9a395 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -100,7 +100,7 @@ for (String os in runITsOses) {
withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
junitPublisher(ignoreAttachments: false)
]) {
- String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true"
+ String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true -Dmaven.skip.rc=true"
if (stageId.endsWith('-jdk7')) {
// Java 7u80 has TLS 1.2 disabled by default: need to explicitly enable
cmd = "${cmd} -Dhttps.protocols=TLSv1.2"
[maven] 04/04: temporarily commented out the jenkinsNotify()
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch removed-java-tools-3
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 4ce461778738d3de8df60e85cf5f070dc9fc2230
Author: tibordigana <ti...@apache.org>
AuthorDate: Sun Aug 4 00:19:26 2019 +0200
temporarily commented out the jenkinsNotify()
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 10a0295..fe257b8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -160,7 +160,7 @@ parallel(runITsTasks)
} finally {
// notify completion
stage("Notifications") {
- jenkinsNotify()
+ //jenkinsNotify()
}
}
[maven] 03/04: core-its branch removed-java-tools-2
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch removed-java-tools-3
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 16a4d30008adf9209eb731fe516ffd818950ff64
Author: tibordigana <ti...@apache.org>
AuthorDate: Sun Aug 4 16:13:01 2019 +0200
core-its branch removed-java-tools-2
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0998f02..10a0295 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -66,7 +66,7 @@ node(jenkinsEnv.nodeSelection(osNode)) {
}
}
- tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
+ tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'removed-java-tools-2']
}
}
[maven] 02/04: IT archives
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch removed-java-tools-3
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 82c68711e0823e277e33fcaa6d7040150760a79e
Author: tibordigana <ti...@apache.org>
AuthorDate: Wed Jul 31 17:22:07 2019 +0200
IT archives
(cherry picked from commit cb71885c14eee51dc8a0f2031c19be3f358ec10c)
---
Jenkinsfile | 43 +++++++++++++++++++++++++++++--------------
1 file changed, 29 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index af9a395..0998f02 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -97,22 +97,29 @@ for (String os in runITsOses) {
bat "if exist apache-maven-dist.zip del /q apache-maven-dist.zip"
}
unstash 'dist'
- withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
- junitPublisher(ignoreAttachments: false)
- ]) {
- String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true -Dmaven.skip.rc=true"
- if (stageId.endsWith('-jdk7')) {
- // Java 7u80 has TLS 1.2 disabled by default: need to explicitly enable
- cmd = "${cmd} -Dhttps.protocols=TLSv1.2"
- }
-
- if (isUnix()) {
- sh "${cmd}"
- } else {
- bat "${cmd}"
+ try {
+ withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
+ junitPublisher(ignoreAttachments: false)
+ ]) {
+ String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true -Dmaven.skip.rc=true"
+ if (stageId.endsWith('-jdk7')) {
+ // Java 7u80 has TLS 1.2 disabled by default: need to explicitly enable
+ cmd = "${cmd} -Dhttps.protocols=TLSv1.2"
+ }
+
+ if (isUnix()) {
+ sh 'df -hT'
+ sh "${cmd}"
+ } else {
+ bat 'wmic logicaldisk get size,freespace,caption'
+ bat "${cmd}"
+ }
}
+ } finally {
+ archiveDirs(stageId, ['core-it-suite-logs':'core-it-suite/target/test-classes',
+ 'core-it-suite-reports':'core-it-suite/target/surefire-reports'])
+ deleteDir() // clean up after ourselves to reduce disk space
}
- deleteDir() // clean up after ourselves to reduce disk space
}
}
}
@@ -156,3 +163,11 @@ parallel(runITsTasks)
jenkinsNotify()
}
}
+
+def archiveDirs(stageId, archives) {
+ archives.each { archivePrefix, pathToContent ->
+ if (fileExists(pathToContent)) {
+ zip(zipFile: "${archivePrefix}-${stageId}.zip", dir: pathToContent, archive: true)
+ }
+ }
+}