Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly suppress exceptions thrown in finally blocks in Jenkinsfile

This commit is contained in:
Yoann Rodière 2024-03-28 17:03:48 +01:00
parent bcbae00552
commit 2a8183371f
2 changed files with 83 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Jenkinsfile vendored
View File

@ -132,7 +132,7 @@ stage('Build') {
stage('Checkout') {
checkout scm
}
try {
tryFinally({
stage('Start database') {
switch (buildEnv.dbName) {
case "edb":
@ -163,7 +163,7 @@ stage('Build') {
'ge.hibernate.org-access-key-pr' : 'ge.hibernate.org-access-key',
variable: 'GRADLE_ENTERPRISE_ACCESS_KEY')]) {
withGradle { // withDevelocity, actually: https://plugins.jenkins.io/gradle/#plugin-content-capturing-build-scans-from-jenkins-pipeline
try {
tryFinally({
if (buildEnv.dbLockableResource == null) {
withCredentials([file(credentialsId: 'sybase-jconnect-driver', variable: 'jconnect_driver')]) {
sh 'cp -f $jconnect_driver ./drivers/jconn4.jar'
@ -182,16 +182,14 @@ stage('Build') {
}
}
}
}
finally {
}, {
junit '**/target/test-results/test/*.xml,**/target/test-results/testKitTest/*.xml'
})
}
}
}
}
}
}
finally {
}, { // Finally
if ( state[buildEnv.tag]['containerName'] != null ) {
sh "docker rm -f ${state[buildEnv.tag]['containerName']}"
}
@ -199,7 +197,7 @@ stage('Build') {
if ( !env.CHANGE_ID && buildEnv.notificationRecipients != null ) {
handleNotifications(currentBuild, buildEnv)
}
}
})
}
}
})
@ -230,16 +228,13 @@ class BuildEnvironment {
void runBuildOnNode(String label, Closure body) {
node( label ) {
pruneDockerContainers()
try {
body()
}
finally {
tryFinally(body, { // Finally
// If this is a PR, we clean the workspace at the end
if ( env.CHANGE_BRANCH != null ) {
cleanWs()
}
pruneDockerContainers()
}
})
}
}
void pruneDockerContainers() {
@ -315,3 +310,33 @@ String getParallelResult( RunWrapper build, String parallelBranchName ) {
}
return branch.status.result
}
// try-finally construct that properly suppresses exceptions thrown in the finally block.
static def tryFinally(Closure main, Closure ... finallies) {
def mainFailure = null
try {
main()
}
catch (Throwable t) {
mainFailure = t
throw t
}
finally {
finallies.each {it ->
try {
it()
}
catch (Throwable t) {
if ( mainFailure ) {
mainFailure.addSuppressed( t )
}
else {
mainFailure = t
}
}
}
}
if ( mainFailure ) { // We may reach here if only the "finally" failed
throw mainFailure
}
}

51
nightly.Jenkinsfile
View File

@ -103,7 +103,7 @@ stage('Build') {
stage('Checkout') {
checkout scm
}
try {
tryFinally({
stage('Start database') {
switch (buildEnv.dbName) {
case "hsqldb_2_6":
@ -175,7 +175,7 @@ stage('Build') {
stage('Test') {
String cmd = "./ci/build.sh ${buildEnv.additionalOptions ?: ''} ${state[buildEnv.tag]['additionalOptions'] ?: ''}"
withEnv(["RDBMS=${buildEnv.dbName}"]) {
try {
tryFinally({
if (buildEnv.dbLockableResource == null) {
withCredentials([file(credentialsId: 'sybase-jconnect-driver', variable: 'jconnect_driver')]) {
sh 'cp -f $jconnect_driver ./drivers/jconn4.jar'
@ -194,14 +194,12 @@ stage('Build') {
}
}
}
}
finally {
}, { // Finally
junit '**/target/test-results/test/*.xml,**/target/test-results/testKitTest/*.xml'
})
}
}
}
}
finally {
}, { // Finally
if ( state[buildEnv.tag]['containerName'] != null ) {
sh "docker rm -f ${state[buildEnv.tag]['containerName']}"
}
@ -209,7 +207,7 @@ stage('Build') {
if ( !env.CHANGE_ID && buildEnv.notificationRecipients != null ) {
handleNotifications(currentBuild, buildEnv)
}
}
})
}
}
})
@ -239,16 +237,13 @@ class BuildEnvironment {
void runBuildOnNode(String label, Closure body) {
node( label ) {
pruneDockerContainers()
try {
body()
}
finally {
tryFinally(body, {
// If this is a PR, we clean the workspace at the end
if ( env.CHANGE_BRANCH != null ) {
cleanWs()
}
pruneDockerContainers()
}
})
}
}
void pruneDockerContainers() {
@ -324,3 +319,33 @@ String getParallelResult( RunWrapper build, String parallelBranchName ) {
}
return branch.status.result
}
// try-finally construct that properly suppresses exceptions thrown in the finally block.
def tryFinally(Closure main, Closure ... finallies) {
def mainFailure = null
try {
main()
}
catch (Throwable t) {
mainFailure = t
throw t
}
finally {
finallies.each {it ->
try {
it()
}
catch (Throwable t) {
if ( mainFailure ) {
mainFailure.addSuppressed( t )
}
else {
mainFailure = t
}
}
}
}
if ( mainFailure ) { // We may reach here if only the "finally" failed
throw mainFailure
}
}