[CI] Only delay ciGroup processes when using tasks (#90038) (#90093)

This commit is contained in:
Brian Seeders 2021-02-02 20:23:41 -05:00 committed by GitHub
parent f3d24a5404
commit 2af05b14ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions

View file

@ -128,9 +128,11 @@ def functionalTestProcess(String name, String script) {
}
}
def ossCiGroupProcess(ciGroup) {
def ossCiGroupProcess(ciGroup, withDelay = false) {
return functionalTestProcess("ciGroup" + ciGroup) {
sleep((ciGroup-1)*30) // smooth out CPU spikes from ES startup
if (withDelay) {
sleep((ciGroup-1)*30) // smooth out CPU spikes from ES startup
}
withEnv([
"CI_GROUP=${ciGroup}",
@ -143,9 +145,11 @@ def ossCiGroupProcess(ciGroup) {
}
}
def xpackCiGroupProcess(ciGroup) {
def xpackCiGroupProcess(ciGroup, withDelay = false) {
return functionalTestProcess("xpack-ciGroup" + ciGroup) {
sleep((ciGroup-1)*30) // smooth out CPU spikes from ES startup
if (withDelay) {
sleep((ciGroup-1)*30) // smooth out CPU spikes from ES startup
}
withEnv([
"CI_GROUP=${ciGroup}",
"JOB=xpack-kibana-ciGroup${ciGroup}",

View file

@ -51,7 +51,7 @@ def functionalOss(Map params = [:]) {
if (config.ciGroups) {
def ciGroups = 1..12
tasks(ciGroups.collect { kibanaPipeline.ossCiGroupProcess(it) })
tasks(ciGroups.collect { kibanaPipeline.ossCiGroupProcess(it, true) })
}
if (config.firefox) {
@ -92,7 +92,7 @@ def functionalXpack(Map params = [:]) {
if (config.ciGroups) {
def ciGroups = 1..13
tasks(ciGroups.collect { kibanaPipeline.xpackCiGroupProcess(it) })
tasks(ciGroups.collect { kibanaPipeline.xpackCiGroupProcess(it, true) })
}
if (config.firefox) {