You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by dp...@apache.org on 2017/07/04 15:54:24 UTC

[1/2] logging-log4net git commit: Jenkinsfile: do interpret test results directly without stashing them

Repository: logging-log4net
Updated Branches:
  refs/heads/feature/cd-pipeline 3a0e2d239 -> a2f76e934


Jenkinsfile: do interpret test results directly without stashing them


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/08939946
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/08939946
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/08939946

Branch: refs/heads/feature/cd-pipeline
Commit: 08939946954de398618734dc81ce1e98cc0fe7bf
Parents: 3a0e2d2
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Jul 4 17:41:37 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Jul 4 17:41:37 2017 +0200

----------------------------------------------------------------------
 Jenkinsfile | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/08939946/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index d56a113..ccfdd59 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,7 +47,7 @@ pipeline {
 				bat "${NANT_BIN} -t:net-3.5 -buildfile:log4net.build compile-net-3.5"
 				stash includes: 'bin/**/*.*', name: 'net-3.5-assemblies'
 				bat "${NANT_BIN} -t:net-3.5 -buildfile:tests/nant.build runtests-net-3.5 || true"
-				stash includes: 'tests/bin/**/results/*.*', name: 'net-3.5-testresults'
+				junit 'tests/bin/**/results/*.*'
 			}
 		}
 		stage('build net-3.5-cp') {
@@ -61,7 +61,7 @@ pipeline {
 				bat "${NANT_BIN} -t:net-3.5 -buildfile:log4net.build compile-net-3.5-cp"
 				stash includes: 'bin/**/*.*', name: 'net-3.5-cp-assemblies'
 				bat "${NANT_BIN} -t:net-3.5 -buildfile:tests/nant.build runtests-net-3.5-cp || true"
-				stash includes: 'tests/bin/**/results/*.*', name: 'net-3.5-cp-testresults'
+				junit 'tests/bin/**/results/*.*'
 			}
 		}
 		stage('build net-4.0') {
@@ -75,7 +75,7 @@ pipeline {
 				bat "${NANT_BIN} -t:net-4.0 -buildfile:log4net.build compile-net-4.0"
 				stash includes: 'bin/**/*.*', name: 'net-4.0-assemblies'
 				bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.0 || true"
-				stash includes: 'tests/bin/**/results/*.*', name: 'net-4.0-testresults'
+				junit 'tests/bin/**/results/*.*'
 			}
 		}
 		stage('build net-4.0-cp') {
@@ -89,7 +89,7 @@ pipeline {
 				bat "${NANT_BIN} -t:net-4.0 -buildfile:log4net.build compile-net-4.0-cp"
 				stash includes: 'bin/**/*.*', name: 'net-4.0-cp-assemblies'
 				bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.0-cp || true"
-				stash includes: 'tests/bin/**/results/*.*', name: 'net-4.0-cp-testresults'
+				junit 'tests/bin/**/results/*.*'
 			}
 		}
 		stage('build net-4.5') {
@@ -103,7 +103,7 @@ pipeline {
 				bat "${NANT_BIN} -t:net-4.0 -buildfile:log4net.build compile-net-4.5"
 				stash includes: 'bin/**/*.*', name: 'net-4.5-assemblies'
 				bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.5 || true"
-				stash includes: 'tests/bin/**/results/*.*', name: 'net-4.5-testresults'
+				junit 'tests/bin/**/results/*.*'
 			}
 		}
 		stage('build mono-2.0') {
@@ -201,13 +201,6 @@ pipeline {
 
 					// unstash site
 					unstash 'site'
-
-					// unstash test results
-					unstash 'net-3.5-testresults'
-					unstash 'net-3.5-cp-testresults'
-					unstash 'net-4.0-testresults'
-					unstash 'net-4.0-cp-testresults'
-					unstash 'net-4.5-testresults'
 				}
 				
 				// move site
@@ -216,9 +209,6 @@ pipeline {
 				
 				// archive package
 				archive 'package/**/*.*'
-
-				// generate unittest reports
-				junit 'package/tests/**/*.xml'
 			}
 		}
 		stage('publish site') {


[2/2] logging-log4net git commit: Jenkinsfile: ignore test failures

Posted by dp...@apache.org.
Jenkinsfile: ignore test failures


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/a2f76e93
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/a2f76e93
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/a2f76e93

Branch: refs/heads/feature/cd-pipeline
Commit: a2f76e93426cf2a9caaf25fd33525b33eec142a6
Parents: 0893994
Author: Dominik Psenner <dp...@apache.org>
Authored: Tue Jul 4 17:54:09 2017 +0200
Committer: Dominik Psenner <dp...@apache.org>
Committed: Tue Jul 4 17:54:09 2017 +0200

----------------------------------------------------------------------
 Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/a2f76e93/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index ccfdd59..70de403 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,7 +46,7 @@ pipeline {
 				checkout scm
 				bat "${NANT_BIN} -t:net-3.5 -buildfile:log4net.build compile-net-3.5"
 				stash includes: 'bin/**/*.*', name: 'net-3.5-assemblies'
-				bat "${NANT_BIN} -t:net-3.5 -buildfile:tests/nant.build runtests-net-3.5 || true"
+				bat "${NANT_BIN} -t:net-3.5 -buildfile:tests/nant.build runtests-net-3.5 && exit 0"
 				junit 'tests/bin/**/results/*.*'
 			}
 		}
@@ -60,7 +60,7 @@ pipeline {
 				checkout scm
 				bat "${NANT_BIN} -t:net-3.5 -buildfile:log4net.build compile-net-3.5-cp"
 				stash includes: 'bin/**/*.*', name: 'net-3.5-cp-assemblies'
-				bat "${NANT_BIN} -t:net-3.5 -buildfile:tests/nant.build runtests-net-3.5-cp || true"
+				bat "${NANT_BIN} -t:net-3.5 -buildfile:tests/nant.build runtests-net-3.5-cp && exit 0"
 				junit 'tests/bin/**/results/*.*'
 			}
 		}
@@ -74,7 +74,7 @@ pipeline {
 				checkout scm
 				bat "${NANT_BIN} -t:net-4.0 -buildfile:log4net.build compile-net-4.0"
 				stash includes: 'bin/**/*.*', name: 'net-4.0-assemblies'
-				bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.0 || true"
+				bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.0 && exit 0"
 				junit 'tests/bin/**/results/*.*'
 			}
 		}
@@ -88,7 +88,7 @@ pipeline {
 				checkout scm
 				bat "${NANT_BIN} -t:net-4.0 -buildfile:log4net.build compile-net-4.0-cp"
 				stash includes: 'bin/**/*.*', name: 'net-4.0-cp-assemblies'
-				bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.0-cp || true"
+				bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.0-cp && exit 0"
 				junit 'tests/bin/**/results/*.*'
 			}
 		}
@@ -102,7 +102,7 @@ pipeline {
 				checkout scm
 				bat "${NANT_BIN} -t:net-4.0 -buildfile:log4net.build compile-net-4.5"
 				stash includes: 'bin/**/*.*', name: 'net-4.5-assemblies'
-				bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.5 || true"
+				bat "${NANT_BIN} -t:net-4.0 -buildfile:tests/nant.build runtests-net-4.5 && exit 0"
 				junit 'tests/bin/**/results/*.*'
 			}
 		}