-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Backport/6.8 - lots of Pipeline updates (#51754)
* Re-add pipeline for flaky test runner job (#48781) * Revert "Revert "Add pipeline for flaky test runner job (#46740)"" This reverts commit 7d96a13. Also reconcile changes to Jenkinsfile since original revert happened * Fix param parsing and add missed change * Add missing variable * Retry git clone up to 8 times before failing a build (#50734) * Flaky test runner improvements/fixes (#49367) * Allocate multiple flaky test runner agents as executions grow * WIP support for deleting kibana install dir during CI * Add setup script for testing scripts * Add REMOVE_KIBANA_INSTALL_DIR=1 to flaky test runner * Change flaky test runner worker processes from 8 to 12 * Add labels to shell scripts in Jenkins (#49657) * Change pipeline timeout from 3 hours to 2 hours (#51098) * Remove flaky pipeline step not relevant for 6.8 * Re-add failed_tests cli * Fix PARALLEL_PIPELINE_WORKER_INDEX var
- Loading branch information
1 parent
1f55188
commit c2d5390
Showing
9 changed files
with
470 additions
and
302 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
#!/bin/groovy | ||
|
||
library 'kibana-pipeline-library' | ||
kibanaLibrary.load() | ||
|
||
// Looks like 'oss:ciGroup:1' or 'oss:firefoxSmoke' | ||
def JOB_PARTS = params.CI_GROUP.split(':') | ||
def IS_XPACK = JOB_PARTS[0] == 'xpack' | ||
def JOB = JOB_PARTS[1] | ||
def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : '' | ||
def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger() | ||
def AGENT_COUNT = getAgentCount(EXECUTIONS) | ||
|
||
def worker = getWorkerFromParams(IS_XPACK, JOB, CI_GROUP) | ||
|
||
def workerFailures = [] | ||
|
||
currentBuild.displayName += trunc(" ${params.GITHUB_OWNER}:${params.branch_specifier}", 24) | ||
currentBuild.description = "${params.CI_GROUP}<br />Agents: ${AGENT_COUNT}<br />Executions: ${params.NUMBER_EXECUTIONS}" | ||
|
||
stage("Kibana Pipeline") { | ||
timeout(time: 180, unit: 'MINUTES') { | ||
timestamps { | ||
ansiColor('xterm') { | ||
def agents = [:] | ||
for(def agentNumber = 1; agentNumber <= AGENT_COUNT; agentNumber++) { | ||
def agentNumberInside = agentNumber | ||
def agentExecutions = floor(EXECUTIONS/AGENT_COUNT) + (agentNumber <= EXECUTIONS%AGENT_COUNT ? 1 : 0) | ||
agents["agent-${agentNumber}"] = { | ||
catchError { | ||
print "Agent ${agentNumberInside} - ${agentExecutions} executions" | ||
|
||
kibanaPipeline.withWorkers('flaky-test-runner', { | ||
if (!IS_XPACK) { | ||
kibanaPipeline.buildOss() | ||
} else { | ||
kibanaPipeline.buildXpack() | ||
} | ||
}, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))() | ||
} | ||
} | ||
} | ||
|
||
parallel(agents) | ||
|
||
currentBuild.description += ", Failures: ${workerFailures.size()}" | ||
|
||
if (workerFailures.size() > 0) { | ||
print "There were ${workerFailures.size()} test suite failures." | ||
print "The executions that failed were:" | ||
print workerFailures.join("\n") | ||
print "Please check 'Test Result' and 'Pipeline Steps' pages for more info" | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
def getWorkerFromParams(isXpack, job, ciGroup) { | ||
if (!isXpack) { | ||
if (job == 'firefoxSmoke') { | ||
return kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') }) | ||
} else if(job == 'visualRegression') { | ||
return kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') }) | ||
} else { | ||
return kibanaPipeline.getOssCiGroupWorker(ciGroup) | ||
} | ||
} | ||
|
||
if (job == 'firefoxSmoke') { | ||
return kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') }) | ||
} else if(job == 'visualRegression') { | ||
return kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') }) | ||
} else { | ||
return kibanaPipeline.getXpackCiGroupWorker(ciGroup) | ||
} | ||
} | ||
|
||
def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWorkerProcesses = 12) { | ||
def workerMap = [:] | ||
def numberOfWorkers = Math.min(numberOfExecutions, maxWorkerProcesses) | ||
|
||
for(def i = 1; i <= numberOfWorkers; i++) { | ||
def workerExecutions = numberOfExecutions/numberOfWorkers + (i <= numberOfExecutions%numberOfWorkers ? 1 : 0) | ||
|
||
workerMap["agent-${agentNumber}-worker-${i}"] = { workerNumber -> | ||
for(def j = 0; j < workerExecutions; j++) { | ||
print "Execute agent-${agentNumber} worker-${workerNumber}: ${j}" | ||
withEnv([ | ||
"JOB=agent-${agentNumber}-worker-${workerNumber}-${j}", | ||
"REMOVE_KIBANA_INSTALL_DIR=1", | ||
]) { | ||
catchError { | ||
try { | ||
worker(workerNumber) | ||
} catch (ex) { | ||
workerFailures << "agent-${agentNumber} worker-${workerNumber}-${j}" | ||
throw ex | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
return workerMap | ||
} | ||
|
||
def getAgentCount(executions) { | ||
// Increase agent count every 24 worker processess, up to 3 agents maximum | ||
return Math.min(3, 1 + floor(executions/24)) | ||
} | ||
|
||
def trunc(str, length) { | ||
if (str.size() >= length) { | ||
return str.take(length) + "..." | ||
} | ||
|
||
return str; | ||
} | ||
|
||
// All of the real rounding/truncating methods are sandboxed | ||
def floor(num) { | ||
return num | ||
.toString() | ||
.split('\\.')[0] | ||
.toInteger() | ||
} |
Oops, something went wrong.