From 8b4bdcea6a260d2a18706c6e44cf324df0f1dca9 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/JenkinsfileBase | 32 ++++++++++++++++---------------- buildenv/jenkins/openjdk_tests | 21 ++++++++++++++++++--- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase index 73fde5c0cb..467f35db21 100644 --- a/buildenv/jenkins/JenkinsfileBase +++ b/buildenv/jenkins/JenkinsfileBase @@ -871,18 +871,7 @@ def testBuild() { terminateTestProcesses() if (!params.KEEP_WORKSPACE) { - try { - // cleanWs() does not work in some cases, so set opts below - 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 - } - + forceCleanWS() // clean up remaining core files if (PLATFORM.contains("mac")) { sh "find /cores -name '*core*' -print 2>/dev/null -exec rm -f {} \\; || true" @@ -1245,8 +1234,7 @@ def run_parallel_tests() { stage ("Parallel Tests") { def childJobs = parallel parallel_tests node { - // cleanWs() does not work in some cases, so set opts below - cleanWs disableDeferredWipeout: true, deleteDirs: true + forceCleanWS() try { def buildPaths = "" childJobs.each { @@ -1277,8 +1265,7 @@ def run_parallel_tests() { triggerRerunJob(failedTests) } } finally { - // cleanWs() does not work in some cases, so set opts below - cleanWs disableDeferredWipeout: true, deleteDirs: true + forceCleanWS() } } } @@ -1304,4 +1291,17 @@ def getGitRepoBranch(ownerBranch, defaultOwnerBranch, repo) { return actualRepoBranch } +def forceCleanWS() { + 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 + } +} + return this diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests index 50187ab3ef..7a4e09c17c 100644 --- a/buildenv/jenkins/openjdk_tests +++ b/buildenv/jenkins/openjdk_tests @@ -270,11 +270,11 @@ timestamps{ } } - def runTest() { try { def retry_count = 0 def sleep_time = 180 + if (params.PLATFORM.contains('zos')) { /* Ensure correct CC env */ env._CC_CCMODE = '1' @@ -295,7 +295,7 @@ def runTest() { } retry_count++ timeout(time: 1, unit: 'HOURS') { - cleanWs disableDeferredWipeout: true, deleteDirs: true + forceCleanWS() } sh "git clone -b ${SCM_GIT_BRANCH} ${SCM_GIT_REPO_VAL} aqa-tests" } @@ -311,7 +311,7 @@ def runTest() { } retry_count++ timeout(time: 1, unit: 'HOURS') { - cleanWs disableDeferredWipeout: true, deleteDirs: true + forceCleanWS() } checkout scm: [$class: 'GitSCM', branches: [[name: "${scm.branches[0].name}"]], @@ -420,3 +420,18 @@ def checkErrors(errorList) { } } } + + +def forceCleanWS() { + 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 + } +} +