From 8c6c017d6b8f7b79511759e1bed1652a90c0b2fa Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Tue, 14 Mar 2023 16:54:04 -0400 Subject: [PATCH] rm workspace/aqa-tests/TKG if cleanWs() fails Signed-off-by: Sophia Guo --- buildenv/jenkins/openjdk_tests | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests index 50187ab3ef..d921fb7658 100644 --- a/buildenv/jenkins/openjdk_tests +++ b/buildenv/jenkins/openjdk_tests @@ -295,7 +295,16 @@ def runTest() { } retry_count++ timeout(time: 1, unit: 'HOURS') { - cleanWs disableDeferredWipeout: true, deleteDirs: true + try { + cleanWs disableDeferredWipeout: true, deleteDirs: true + } catch (Exception e) { + echo 'Exception: ' + e.toString() + //cleanWs has issue to delete workspace that contains non-ASCII filename in TKG output https://issues.jenkins.io/browse/JENKINS-33478 + //cannot delete workspace directly. Otherwise, Jenkins job will abort due to missing workspace + sh "rm -rf ${env.WORKSPACE}/aqa-tests/TKG" + // call cleanWs() again + cleanWs disableDeferredWipeout: true, deleteDirs: true + } } sh "git clone -b ${SCM_GIT_BRANCH} ${SCM_GIT_REPO_VAL} aqa-tests" } @@ -311,7 +320,16 @@ def runTest() { } retry_count++ timeout(time: 1, unit: 'HOURS') { - cleanWs disableDeferredWipeout: true, deleteDirs: true + try { + cleanWs disableDeferredWipeout: true, deleteDirs: true + } catch (Exception e) { + echo 'Exception: ' + e.toString() + //cleanWs has issue to delete workspace that contains non-ASCII filename in TKG output https://issues.jenkins.io/browse/JENKINS-33478 + //cannot delete workspace directly. Otherwise, Jenkins job will abort due to missing workspace + sh "rm -rf ${env.WORKSPACE}/aqa-tests/TKG" + // call cleanWs() again + cleanWs disableDeferredWipeout: true, deleteDirs: true + } } checkout scm: [$class: 'GitSCM', branches: [[name: "${scm.branches[0].name}"]],