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/07/31 20:25:31 UTC
[maven] branch archives updated (d755f6b -> cb71885)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch archives
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard d755f6b investigating dir layout and IT archives
discard 7593f4e IT archives
new cb71885 IT archives
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d755f6b)
\
N -- N -- N refs/heads/archives (cb71885)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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.
Summary of changes:
Jenkinsfile | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
[maven] 01/01: 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 archives
in repository https://gitbox.apache.org/repos/asf/maven.git
commit cb71885c14eee51dc8a0f2031c19be3f358ec10c
Author: tibordigana <ti...@apache.org>
AuthorDate: Wed Jul 31 17:22:07 2019 +0200
IT archives
---
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)
+ }
+ }
+}