From a4e5a73af1df3020b5d50d5a198963bd66e5c370 Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Wed, 28 Jul 2021 15:41:45 +0100
Subject: [PATCH] [CI] use try to avoid a global abort (#27080)

---
 Jenkinsfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 01157d60114..1d826ff32c9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -701,7 +701,7 @@ def tearDown() {
 */
 def fixPermissions(location) {
   if(isUnix()) {
-    catchError(message: 'There were some failures when fixing the permissions', buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
+    try {
       timeout(5) {
         sh(label: 'Fix permissions', script: """#!/usr/bin/env bash
           set +x
@@ -710,6 +710,8 @@ def fixPermissions(location) {
           docker_setup
           script/fix_permissions.sh ${location}""", returnStatus: true)
       }
+    } catch (Throwable e) {
+      echo "There were some failures when fixing the permissions. ${e.toString()}"
     }
   }
 }