Skip to content

Commit 356cc04

Browse files
brianseedersbrianseeders
committed
[FTSR] Convert to tasks and add jest/api integration suites (#91770)
# Conflicts: # .ci/Jenkinsfile_flaky
1 parent 3efc70e commit 356cc04

2 files changed

Lines changed: 85 additions & 59 deletions

File tree

‎.ci/Jenkinsfile_flaky‎

Lines changed: 78 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,39 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

6-
def CI_GROUP_PARAM = params.CI_GROUP
6+
def TASK_PARAM = params.TASK ?: params.CI_GROUP
77

88
// Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke'
9-
def JOB_PARTS = CI_GROUP_PARAM.split(':')
9+
def JOB_PARTS = TASK_PARAM.split(':')
1010
def IS_XPACK = JOB_PARTS[0] == 'xpack'
11-
def JOB = JOB_PARTS[1]
11+
def JOB = JOB_PARTS.size() > 1 ? JOB_PARTS[1] : JOB_PARTS[0]
1212
def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : ''
1313
def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger()
1414
def AGENT_COUNT = getAgentCount(EXECUTIONS)
15-
16-
def worker = getWorkerFromParams(IS_XPACK, JOB, CI_GROUP)
17-
18-
def workerFailures = []
15+
def NEED_BUILD = JOB != 'jestIntegration' && JOB != 'apiIntegration'
1916

2017
currentBuild.displayName += trunc(" ${params.GITHUB_OWNER}:${params.branch_specifier}", 24)
2118
currentBuild.description = "${params.CI_GROUP}<br />Agents: ${AGENT_COUNT}<br />Executions: ${params.NUMBER_EXECUTIONS}"
2219

2320
kibanaPipeline(timeoutMinutes: 180) {
2421
def agents = [:]
22+
def workerFailures = []
23+
24+
def worker = getWorkerFromParams(IS_XPACK, JOB, CI_GROUP)
25+
2526
for(def agentNumber = 1; agentNumber <= AGENT_COUNT; agentNumber++) {
26-
def agentNumberInside = agentNumber
2727
def agentExecutions = floor(EXECUTIONS/AGENT_COUNT) + (agentNumber <= EXECUTIONS%AGENT_COUNT ? 1 : 0)
28+
2829
agents["agent-${agentNumber}"] = {
29-
catchErrors {
30-
print "Agent ${agentNumberInside} - ${agentExecutions} executions"
31-
32-
workers.functional('flaky-test-runner', {
33-
if (!IS_XPACK) {
34-
kibanaPipeline.buildOss()
35-
if (CI_GROUP == '1') {
36-
runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
37-
}
38-
} else {
39-
kibanaPipeline.buildXpack()
40-
}
41-
}, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
42-
}
30+
agentProcess(
31+
agentNumber: agentNumber,
32+
agentExecutions: agentExecutions,
33+
worker: worker,
34+
workerFailures: workerFailures,
35+
needBuild: NEED_BUILD,
36+
isXpack: IS_XPACK,
37+
ciGroup: CI_GROUP
38+
)
4339
}
4440
}
4541

@@ -55,14 +51,70 @@ kibanaPipeline(timeoutMinutes: 180) {
5551
}
5652
}
5753

54+
def agentProcess(Map params = [:]) {
55+
def config = [
56+
agentNumber: 1,
57+
agentExecutions: 0,
58+
worker: {},
59+
workerFailures: [],
60+
needBuild: false,
61+
isXpack: false,
62+
ciGroup: null,
63+
] + params
64+
65+
catchErrors {
66+
print "Agent ${config.agentNumber} - ${config.agentExecutions} executions"
67+
68+
withEnv([
69+
'IGNORE_SHIP_CI_STATS_ERROR=true',
70+
]) {
71+
kibanaPipeline.withTasks([
72+
parallel: 20,
73+
]) {
74+
task {
75+
if (config.needBuild) {
76+
if (!config.isXpack) {
77+
kibanaPipeline.buildOss()
78+
} else {
79+
kibanaPipeline.buildXpack()
80+
}
81+
}
82+
83+
for(def i = 0; i < config.agentExecutions; i++) {
84+
def taskNumber = i
85+
task({
86+
withEnv([
87+
"REMOVE_KIBANA_INSTALL_DIR=1",
88+
]) {
89+
catchErrors {
90+
try {
91+
config.worker()
92+
} catch (ex) {
93+
config.workerFailures << "agent-${config.agentNumber}-${taskNumber}"
94+
throw ex
95+
}
96+
}
97+
}
98+
})
99+
}
100+
}
101+
}
102+
}
103+
}
104+
}
105+
58106
def getWorkerFromParams(isXpack, job, ciGroup) {
59107
if (!isXpack) {
60108
if (job == 'accessibility') {
61109
return kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh')
62110
} else if (job == 'firefoxSmoke') {
63111
return kibanaPipeline.functionalTestProcess('firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh')
64-
} else if(job == 'visualRegression') {
112+
} else if (job == 'visualRegression') {
65113
return kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh')
114+
} else if (job == 'jestIntegration') {
115+
return kibanaPipeline.scriptTaskDocker('Jest Integration Tests', 'test/scripts/test/jest_integration.sh')
116+
} else if (job == 'apiIntegration') {
117+
return kibanaPipeline.scriptTask('API Integration Tests', 'test/scripts/test/api_integration.sh')
66118
} else {
67119
return kibanaPipeline.ossCiGroupProcess(ciGroup)
68120
}
@@ -72,45 +124,16 @@ def getWorkerFromParams(isXpack, job, ciGroup) {
72124
return kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh')
73125
} else if (job == 'firefoxSmoke') {
74126
return kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh')
75-
} else if(job == 'visualRegression') {
127+
} else if (job == 'visualRegression') {
76128
return kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')
77129
} else {
78130
return kibanaPipeline.xpackCiGroupProcess(ciGroup)
79131
}
80132
}
81133

82-
def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWorkerProcesses = 12) {
83-
def workerMap = [:]
84-
def numberOfWorkers = Math.min(numberOfExecutions, maxWorkerProcesses)
85-
86-
for(def i = 1; i <= numberOfWorkers; i++) {
87-
def workerExecutions = floor(numberOfExecutions/numberOfWorkers + (i <= numberOfExecutions%numberOfWorkers ? 1 : 0))
88-
89-
workerMap["agent-${agentNumber}-worker-${i}"] = { workerNumber ->
90-
for(def j = 0; j < workerExecutions; j++) {
91-
print "Execute agent-${agentNumber} worker-${workerNumber}: ${j}"
92-
withEnv([
93-
"REMOVE_KIBANA_INSTALL_DIR=1",
94-
]) {
95-
catchErrors {
96-
try {
97-
worker(workerNumber)
98-
} catch (ex) {
99-
workerFailures << "agent-${agentNumber} worker-${workerNumber}-${j}"
100-
throw ex
101-
}
102-
}
103-
}
104-
}
105-
}
106-
}
107-
108-
return workerMap
109-
}
110-
111134
def getAgentCount(executions) {
112-
// Increase agent count every 24 worker processess, up to 3 agents maximum
113-
return Math.min(3, 1 + floor(executions/24))
135+
// Increase agent count every 20 worker processess, up to 3 agents maximum
136+
return Math.min(3, 1 + floor(executions/20))
114137
}
115138

116139
def trunc(str, length) {

‎vars/kibanaPipeline.groovy‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,12 +407,13 @@ def buildXpackPlugins() {
407407
runbld('./test/scripts/jenkins_xpack_build_plugins.sh', 'Build X-Pack Plugins')
408408
}
409409

410-
def withTasks(Map params = [worker: [:]], Closure closure) {
410+
def withTasks(Map params = [:], Closure closure) {
411411
catchErrors {
412-
def config = [name: 'ci-worker', size: 'xxl', ramDisk: true] + (params.worker ?: [:])
412+
def config = [setupWork: {}, worker: [:], parallel: 24] + params
413+
def workerConfig = [name: 'ci-worker', size: 'xxl', ramDisk: true] + config.worker
413414

414-
workers.ci(config) {
415-
withCiTaskQueue(parallel: 24) {
415+
workers.ci(workerConfig) {
416+
withCiTaskQueue([parallel: config.parallel]) {
416417
parallel([
417418
docker: {
418419
retry(2) {
@@ -425,6 +426,8 @@ def withTasks(Map params = [worker: [:]], Closure closure) {
425426
xpackPlugins: { buildXpackPlugins() },
426427
])
427428

429+
config.setupWork()
430+
428431
catchErrors {
429432
closure()
430433
}

0 commit comments

Comments
 (0)