Merge branch 'master' into bugfix/use-home-autodetect

Vasileios Karakasis · web-flow · commit 9620dd15ff0d · 2021-07-15T15:05:37.000+02:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -141,7 +141,7 @@ stage('Cleanup') {
                 }
             }
         }
-        catchError(stageResult: 'FAILURE') {
+        catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
             parallel builds
         }
     }
@@ -163,8 +163,7 @@ stage('Cleanup Stale') {
             }
         }
     }
-
-    catchError(stageResult: 'FAILURE') {
+    catchError(buildResult: 'SUCCESS',  stageResult: 'FAILURE') {
         parallel builds
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ stage('Cleanup') {`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`	`}`
`144`		`- catchError(stageResult: 'FAILURE') {`
	`144`	`+ catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {`
`145`	`145`	`parallel builds`
`146`	`146`	`}`
`147`	`147`	`}`
`@@ -163,8 +163,7 @@ stage('Cleanup Stale') {`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`}`
`166`		`-`
`167`		`- catchError(stageResult: 'FAILURE') {`
	`166`	`+ catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {`
`168`	`167`	`parallel builds`
`169`	`168`	`}`
`170`	`169`	`}`