Merge branch 'release/os/4.5' into wz/merge-45-46-2020-07-21

This commit is contained in:
Waldemar Zurowski 2020-07-21 15:59:07 +01:00
commit a90197ed81
5 changed files with 6 additions and 6 deletions

View File

@ -153,7 +153,7 @@ pipeline {
post { post {
always { always {
archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
junit testResults: '**/build/test-results-xml/**/*.xml', allowEmptyResults: true junit testResults: '**/build/test-results-xml/**/*.xml'
} }
cleanup { cleanup {
deleteDir() /* clean up our workspace */ deleteDir() /* clean up our workspace */

View File

@ -65,7 +65,7 @@ pipeline {
post { post {
always { always {
archiveArtifacts allowEmptyArchive: true, artifacts: '**/logs/**/*.log' archiveArtifacts allowEmptyArchive: true, artifacts: '**/logs/**/*.log'
junit testResults: '**/build/test-results/**/*.xml', keepLongStdio: true, allowEmptyResults: true junit testResults: '**/build/test-results/**/*.xml', keepLongStdio: true
bat '.ci/kill_corda_procs.cmd' bat '.ci/kill_corda_procs.cmd'
} }
cleanup { cleanup {
@ -87,7 +87,7 @@ pipeline {
post { post {
always { always {
archiveArtifacts allowEmptyArchive: true, artifacts: '**/logs/**/*.log' archiveArtifacts allowEmptyArchive: true, artifacts: '**/logs/**/*.log'
junit testResults: '**/build/test-results/**/*.xml', keepLongStdio: true, allowEmptyResults: true junit testResults: '**/build/test-results/**/*.xml', keepLongStdio: true
bat '.ci/kill_corda_procs.cmd' bat '.ci/kill_corda_procs.cmd'
} }
cleanup { cleanup {

View File

@ -84,7 +84,7 @@ pipeline {
post { post {
always { always {
archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
junit testResults: '**/build/test-results-xml/**/*.xml', allowEmptyResults: true, keepLongStdio: true junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true
} }
cleanup { cleanup {
deleteDir() /* clean up our workspace */ deleteDir() /* clean up our workspace */

View File

@ -178,7 +178,7 @@ pipeline {
post { post {
always { always {
archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true, allowEmptyResults: true junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true
script { script {
try { try {

2
Jenkinsfile vendored
View File

@ -79,7 +79,7 @@ pipeline {
post { post {
always { always {
archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true, allowEmptyResults: true junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true
} }
cleanup { cleanup {
deleteDir() /* clean up our workspace */ deleteDir() /* clean up our workspace */