valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Actually catch the exception when we fail

Browse Source 
This should actually cause builds to fail when any part in the try block
fails. We still delete instances and try junit rendering, but if things
fail then they get marked on github as failed.
This commit is contained in:
William Giokas 2018-10-03 14:13:48 +02:00
parent 1c8def9641
commit c88a81d059
No known key found for this signature in database
GPG Key ID: 690206D873CD09CF
6 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/kitchen-centos7-py2
View File

@ -54,6 +54,8 @@ timeout(time: 6, unit: 'HOURS') {
archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log' archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log'
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
} finally { } finally {
try { try {
junit 'artifacts/xml-unittests-output/*.xml' junit 'artifacts/xml-unittests-output/*.xml'

2
.ci/kitchen-centos7-py3
View File

@ -54,6 +54,8 @@ timeout(time: 6, unit: 'HOURS') {
archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log' archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log'
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
} finally { } finally {
try { try {
junit 'artifacts/xml-unittests-output/*.xml' junit 'artifacts/xml-unittests-output/*.xml'

2
.ci/kitchen-ubuntu1604-py2
View File

@ -54,6 +54,8 @@ timeout(time: 6, unit: 'HOURS') {
archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log' archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log'
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
} finally { } finally {
try { try {
junit 'artifacts/xml-unittests-output/*.xml' junit 'artifacts/xml-unittests-output/*.xml'

2
.ci/kitchen-ubuntu1604-py3
View File

@ -54,6 +54,8 @@ timeout(time: 6, unit: 'HOURS') {
archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log' archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log'
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
} finally { } finally {
try { try {
junit 'artifacts/xml-unittests-output/*.xml' junit 'artifacts/xml-unittests-output/*.xml'

2
.ci/kitchen-windows2016-py2
View File

@ -54,6 +54,8 @@ timeout(time: 6, unit: 'HOURS') {
archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log' archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log'
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
} finally { } finally {
try { try {
junit 'artifacts/xml-unittests-output/*.xml' junit 'artifacts/xml-unittests-output/*.xml'

2
.ci/kitchen-windows2016-py3
View File

@ -54,6 +54,8 @@ timeout(time: 6, unit: 'HOURS') {
archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log' archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log'
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
} finally { } finally {
try { try {
junit 'artifacts/xml-unittests-output/*.xml' junit 'artifacts/xml-unittests-output/*.xml'