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

[sophia-guo]

Related #4417 (comment)

Related adoptium/infrastructure#2630

Signed-off-by: Sophia Guo [email protected]

[smlambert]

Looking at this code, it feels like there is a big chunk of duplicate code in the zos and non-zos case:

aqa-tests/buildenv/jenkins/openjdk_tests

Lines 292 to 308 in 8c6c017

	retry(5) {
	if (retry_count > 0) {
	sleep(sleep_time)
	}
	retry_count++
	timeout(time: 1, unit: 'HOURS') {
	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
	}
	}

and

aqa-tests/buildenv/jenkins/openjdk_tests

Lines 317 to 333 in 8c6c017

	retry(5) {
	if (retry_count > 0) {
	sleep(sleep_time)
	}
	retry_count++
	timeout(time: 1, unit: 'HOURS') {
	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
	}
	}

Is there an opportunity to also reduce duplication within runTest()?

[llxia]

Also, the cleanWs code in this PR is duplicated from

aqa-tests/buildenv/jenkins/JenkinsfileBase

Lines 858 to 868 in 8c6c017

	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
	}

.

We should create a function for it as it is used in 3 places.

[sophia-guo]

Grinder:

1. Non parallel https://ci.adoptium.net/view/Test_grinder/job/Grinder/6911/
2. Parallel https://ci.adoptium.net/view/Test_grinder/job/Grinder/6912/

[sophia-guo]

Defined the function forceCleanWS() twice. One is in jenkinsfileBase ( for post stage of jenkins job) and one is in openjdk_tests ( Initial stage of the jenkins job). Otherwise extra the git clone ( an extra git clone for this specific case) or curl the file jenkinsfileBase file would be needed. I'm fine with two definitions, but open to other suggestions.

[karianna]

whitespace?

[karianna]

whitespace?

[karianna]

whitespace again

[llxia]

Do we still need the comment? If so, it should be moved before line1298?

[llxia]

LGTM