Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rm workspace/aqa-tests/TKG if cleanWs() fails #4426

Merged
merged 1 commit into from
Mar 21, 2023
Merged

rm workspace/aqa-tests/TKG if cleanWs() fails #4426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions buildenv/jenkins/JenkinsfileBase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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()
}
}
}
Expand All @@ -1304,4 +1291,17 @@ def getGitRepoBranch(ownerBranch, defaultOwnerBranch, repo) {
return actualRepoBranch
}

def forceCleanWS() {
try {
cleanWs disableDeferredWipeout: true, deleteDirs: true
sophia-guo marked this conversation as resolved.
Show resolved Hide resolved
} catch (Exception e) {
echo 'Exception: ' + e.toString()
sophia-guo marked this conversation as resolved.
Show resolved Hide resolved
//cleanWs has issue to delete workspace that contains non-ASCII filename in TKG output https://issues.jenkins.io/browse/JENKINS-33478
sophia-guo marked this conversation as resolved.
Show resolved Hide resolved
//cannot delete workspace directly. Otherwise, Jenkins job will abort due to missing workspace
sophia-guo marked this conversation as resolved.
Show resolved Hide resolved
sh "rm -rf ${env.WORKSPACE}/aqa-tests/TKG"
sophia-guo marked this conversation as resolved.
Show resolved Hide resolved
// call cleanWs() again
sophia-guo marked this conversation as resolved.
Show resolved Hide resolved
cleanWs disableDeferredWipeout: true, deleteDirs: true
sophia-guo marked this conversation as resolved.
Show resolved Hide resolved
}
}

return this
21 changes: 18 additions & 3 deletions buildenv/jenkins/openjdk_tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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"
}
Expand All @@ -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}"]],
Expand Down Expand Up @@ -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
sophia-guo marked this conversation as resolved.
Show resolved Hide resolved
//cannot delete workspace directly. Otherwise, Jenkins job will abort due to missing workspace
sophia-guo marked this conversation as resolved.
Show resolved Hide resolved
sh "rm -rf ${env.WORKSPACE}/aqa-tests/TKG"
// call cleanWs() again
cleanWs disableDeferredWipeout: true, deleteDirs: true
}
}