diff --git a/.ci/Jenkinsfile_flaky b/.ci/Jenkinsfile_flaky
index 0ae30a7d27d317..f702405aad69e3 100644
--- a/.ci/Jenkinsfile_flaky
+++ b/.ci/Jenkinsfile_flaky
@@ -11,26 +11,28 @@ def IS_XPACK = JOB_PARTS[0] == 'xpack'
def JOB = JOB_PARTS[1]
def NEED_BUILD = JOB != 'serverMocha'
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}
Executions: ${params.NUMBER_EXECUTIONS}"
-
-// Note: If you increase agent count, it will execute NUMBER_EXECUTIONS per agent. It will not divide them up amongst the agents
-// e.g. NUMBER_EXECUTIONS = 25, agentCount = 4 results in 100 total executions
-def agentCount = 1
+currentBuild.description = "${params.CI_GROUP}
Agents: ${AGENT_COUNT}
Executions: ${params.NUMBER_EXECUTIONS}"
stage("Kibana Pipeline") {
timeout(time: 180, unit: 'MINUTES') {
timestamps {
ansiColor('xterm') {
def agents = [:]
- for(def agentNumber = 1; agentNumber <= agentCount; agentNumber++) {
+ 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 (NEED_BUILD) {
if (!IS_XPACK) {
@@ -42,7 +44,7 @@ stage("Kibana Pipeline") {
kibanaPipeline.buildXpack()
}
}
- }, getWorkerMap(agentNumber, params.NUMBER_EXECUTIONS.toInteger(), worker, workerFailures))()
+ }, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
}
}
}
@@ -92,9 +94,9 @@ def getWorkerFromParams(isXpack, job, ciGroup) {
}
}
-def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWorkers = 14) {
+def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWorkerProcesses = 12) {
def workerMap = [:]
- def numberOfWorkers = Math.min(numberOfExecutions, maxWorkers)
+ def numberOfWorkers = Math.min(numberOfExecutions, maxWorkerProcesses)
for(def i = 1; i <= numberOfWorkers; i++) {
def workerExecutions = floor(numberOfExecutions/numberOfWorkers + (i <= numberOfExecutions%numberOfWorkers ? 1 : 0))
@@ -102,7 +104,10 @@ def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWor
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}"]) {
+ withEnv([
+ "JOB=agent-${agentNumber}-worker-${workerNumber}-${j}",
+ "REMOVE_KIBANA_INSTALL_DIR=1",
+ ]) {
catchError {
try {
worker(workerNumber)
@@ -119,6 +124,11 @@ def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWor
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) + "..."
@@ -126,3 +136,11 @@ def trunc(str, length) {
return str;
}
+
+// All of the real rounding/truncating methods are sandboxed
+def floor(num) {
+ return num
+ .toString()
+ .split('\\.')[0]
+ .toInteger()
+}
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
index a51035aa48e37e..cf001b230f80ff 100755
--- a/test/scripts/jenkins_ci_group.sh
+++ b/test/scripts/jenkins_ci_group.sh
@@ -1,12 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
-
-export TEST_BROWSER_HEADLESS=1
+source test/scripts/jenkins_test_setup.sh
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
yarn run grunt functionalTests:ensureAllTestsInCiGroup;
diff --git a/test/scripts/jenkins_firefox_smoke.sh b/test/scripts/jenkins_firefox_smoke.sh
index 69cedc9657340b..9a31f5f43d2242 100755
--- a/test/scripts/jenkins_firefox_smoke.sh
+++ b/test/scripts/jenkins_firefox_smoke.sh
@@ -1,10 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
+source test/scripts/jenkins_test_setup.sh
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
node scripts/build --debug --oss;
diff --git a/test/scripts/jenkins_test_setup.sh b/test/scripts/jenkins_test_setup.sh
new file mode 100644
index 00000000000000..e2dd0bc276bb64
--- /dev/null
+++ b/test/scripts/jenkins_test_setup.sh
@@ -0,0 +1,20 @@
+set -e
+
+function post_work() {
+ set +e
+ if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+ node "$KIBANA_DIR/scripts/report_failed_tests"
+ fi
+
+ if [[ -z "$REMOVE_KIBANA_INSTALL_DIR" && -z "$KIBANA_INSTALL_DIR" && -d "$KIBANA_INSTALL_DIR" ]]; then
+ rm -rf "$REMOVE_KIBANA_INSTALL_DIR"
+ fi
+}
+
+trap 'post_work' EXIT
+
+export TEST_BROWSER_HEADLESS=1
+
+if [[ -n "$IS_PIPELINE_JOB" ]] ; then
+ source src/dev/ci_setup/setup_env.sh
+fi
diff --git a/test/scripts/jenkins_visual_regression.sh b/test/scripts/jenkins_visual_regression.sh
index fdda24423d977a..9ca1c0f08d2c94 100755
--- a/test/scripts/jenkins_visual_regression.sh
+++ b/test/scripts/jenkins_visual_regression.sh
@@ -1,11 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
-
+source test/scripts/jenkins_test_setup.sh
source "$KIBANA_DIR/src/dev/ci_setup/setup_percy.sh"
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
@@ -22,8 +17,6 @@ else
export KIBANA_INSTALL_DIR="$destDir"
fi
-export TEST_BROWSER_HEADLESS=1
-
checks-reporter-with-killswitch "Kibana visual regression tests" \
yarn run percy exec -t 500 \
node scripts/functional_tests \
diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh
index 0b9666b33decab..fba05f8f252d76 100755
--- a/test/scripts/jenkins_xpack_ci_group.sh
+++ b/test/scripts/jenkins_xpack_ci_group.sh
@@ -1,12 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
-
-export TEST_BROWSER_HEADLESS=1
+source test/scripts/jenkins_test_setup.sh
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
echo " -> Ensuring all functional tests are in a ciGroup"
diff --git a/test/scripts/jenkins_xpack_firefox_smoke.sh b/test/scripts/jenkins_xpack_firefox_smoke.sh
index 18ed468de1317a..43220459bcb97d 100755
--- a/test/scripts/jenkins_xpack_firefox_smoke.sh
+++ b/test/scripts/jenkins_xpack_firefox_smoke.sh
@@ -1,10 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
+source test/scripts/jenkins_test_setup.sh
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
node scripts/build --debug --no-oss;
@@ -21,8 +17,6 @@ else
export KIBANA_INSTALL_DIR="$destDir"
fi
-export TEST_BROWSER_HEADLESS=1
-
cd "$XPACK_DIR"
checks-reporter-with-killswitch "X-Pack firefox smoke test" \
diff --git a/test/scripts/jenkins_xpack_visual_regression.sh b/test/scripts/jenkins_xpack_visual_regression.sh
index 0f3275d45f13b2..5699f9e5ee7c14 100755
--- a/test/scripts/jenkins_xpack_visual_regression.sh
+++ b/test/scripts/jenkins_xpack_visual_regression.sh
@@ -1,11 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
-
+source test/scripts/jenkins_test_setup.sh
source "$KIBANA_DIR/src/dev/ci_setup/setup_percy.sh"
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
@@ -23,8 +18,6 @@ else
export KIBANA_INSTALL_DIR="$destDir"
fi
-export TEST_BROWSER_HEADLESS=1
-
cd "$XPACK_DIR"
checks-reporter-with-killswitch "X-Pack visual regression tests" \