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

Jump to bottom

Trigger rerun builds without holding an extra machine #4593

Merged
merged 1 commit into from
May 31, 2023
Merged

Trigger rerun builds without holding an extra machine #4593

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
16 changes: 7 additions & 9 deletions buildenv/jenkins/JenkinsfileBase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def setupEnv() {
env.DYNAMIC_COMPILE=params.DYNAMIC_COMPILE ? params.DYNAMIC_COMPILE : false
env.USE_JRE=params.USE_JRE ? params.USE_JRE : false
env.RERUN_LINK = ""
env.FAILED_TESTS = ""
env.FAILED_TEST_TARGET = ""
env.CUSTOM_TARGET_KEY_VALUE =""
env.DOCKER_REGISTRY_URL = params.DOCKER_REGISTRY_URL ? params.DOCKER_REGISTRY_URL : ""
Expand Down Expand Up @@ -860,8 +861,7 @@ def post(output_name) {
uploadToArtifactory(pattern)
}
}
String failedTests = addFailedTestsGrinderLink()
triggerRerunJob(failedTests)
addFailedTestsGrinderLink()
}
}

Expand Down Expand Up @@ -1154,6 +1154,7 @@ def addFailedTestsGrinderLink(paths=""){
}
if (failedTestList) {
String failedTests = failedTestList.substring(0, failedTestList.length() - 1)
env.FAILED_TESTS= failedTests ?: ""
failedTestList = "testList+TESTLIST=" + failedTests
String url = env.RERUN_LINK
def failedTestUrl = url.replace(env.FAILED_TEST_TARGET, "TARGET=$failedTestList")
Expand All @@ -1174,9 +1175,7 @@ def addFailedTestsGrinderLink(paths=""){
echo "Rerun failed ${target} test cases in Grinder with ${target}_custom target: ${customURL}"
currentBuild.description += "<br><a href=${customURL}> Rerun failed ${target} test cases in Grinder with ${target}_custom target</a>"
}
return failedTests;
}
return null;
}
}

Expand Down Expand Up @@ -1204,11 +1203,11 @@ def generateJob (newJobs, childTest, testJobName) {
}
}
}
def triggerRerunJob (failedTests) {
def triggerRerunJob () {
// if the JOB_NAME contains _rerun or _testList_, we will not trigger rerun job
if (!JOB_NAME.contains("_rerun") && !JOB_NAME.contains("_testList_") && !JOB_NAME.contains("_iteration_")) {
int rerunIterations = params.RERUN_ITERATIONS ? params.RERUN_ITERATIONS.toInteger() : 0
if (rerunIterations > 0 && failedTests) {
if (rerunIterations > 0 && env.FAILED_TESTS?.trim()) {
stage('Rerun') {
def rerunJobName = "${JOB_NAME}_rerun"
def newJobs = [:]
Expand All @@ -1221,7 +1220,7 @@ def triggerRerunJob (failedTests) {
// set PARALLEL, NUM_MACHINES and TEST_TIME to default values
// set TARGET to failed tests and set ITERATIONS to rerunIterations
if (param.key == "TARGET") {
childParams << string(name: param.key, value: "testList TESTLIST=" + failedTests )
childParams << string(name: param.key, value: "testList TESTLIST=" + env.FAILED_TESTS)
} else if (param.key == "PARALLEL") {
childParams << string(name: param.key, value: "None")
} else if (param.key == "NUM_MACHINES") {
Expand Down Expand Up @@ -1281,8 +1280,7 @@ def run_parallel_tests() {

archiveAQAvitFiles()
if (buildPaths.length() > 0) {
String failedTests = addFailedTestsGrinderLink(buildPaths.substring(0, buildPaths.length() - 1))
triggerRerunJob(failedTests)
addFailedTestsGrinderLink(buildPaths.substring(0, buildPaths.length() - 1))
}
} finally {
forceCleanWS()
Expand Down
1 change: 1 addition & 0 deletions buildenv/jenkins/openjdk_tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ timestamps{
}
if (currentBuild.result != 'FAILURE') {
jenkinsfile.run_parallel_tests()
jenkinsfile.triggerRerunJob()
}
} else {
assert false : "Cannot find key PLATFORM: ${params.PLATFORM} in PLATFORM_MAP: ${PLATFORM_MAP}."
Expand Down