From d8daf9934f7d9afaeecd7440dea0cc63f073a4dc Mon Sep 17 00:00:00 2001
From: spalger <email@spalger.com>
Date: Wed, 28 Aug 2019 16:35:34 -0700
Subject: [PATCH] combine jobs to cut down workers and trade time for stability

---
 .ci/jobs.yml | 39 +++++++++---------------------
 .ci/run.sh   | 67 +++++++++++++++++++++++++++-------------------------
 2 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/.ci/jobs.yml b/.ci/jobs.yml
index 89fce3cf488d5..227cd5e78224d 100644
--- a/.ci/jobs.yml
+++ b/.ci/jobs.yml
@@ -1,34 +1,17 @@
 JOB:
-  - kibana-intake
-  - x-pack-intake
-  - kibana-firefoxSmoke
-  - kibana-ciGroup1
-  - kibana-ciGroup2
-  - kibana-ciGroup3
-  - kibana-ciGroup4
-  - kibana-ciGroup5
-  - kibana-ciGroup6
-  - kibana-ciGroup7
-  - kibana-ciGroup8
-  - kibana-ciGroup9
-  - kibana-ciGroup10
-  - kibana-ciGroup11
-  - kibana-ciGroup12
-  - kibana-visualRegression
+  - kibana-intake,x-pack-intake
+  - kibana-firefoxSmoke,x-pack-firefoxSmoke
+  - kibana-visualRegression,x-pack-visualRegression
+
+  - kibana-ciGroup1,kibana-ciGroup2,kibana-ciGroup3,kibana-ciGroup4
+  - kibana-ciGroup5,kibana-ciGroup6,kibana-ciGroup7,kibana-ciGroup8
+  - kibana-ciGroup9,kibana-ciGroup10,kibana-ciGroup11,kibana-ciGroup12
 
   # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
-  - x-pack-firefoxSmoke
-  - x-pack-ciGroup1
-  - x-pack-ciGroup2
-  - x-pack-ciGroup3
-  - x-pack-ciGroup4
-  - x-pack-ciGroup5
-  - x-pack-ciGroup6
-  - x-pack-ciGroup7
-  - x-pack-ciGroup8
-  - x-pack-ciGroup9
-  - x-pack-ciGroup10
-  - x-pack-visualRegression
+  - x-pack-ciGroup1,x-pack-ciGroup2,x-pack-ciGroup3
+  - x-pack-ciGroup4,x-pack-ciGroup5,x-pack-ciGroup6
+  - x-pack-ciGroup7,x-pack-ciGroup8
+  - x-pack-ciGroup9,x-pack-ciGroup10
 
 # `~` is yaml for `null`
 exclude: ~
diff --git a/.ci/run.sh b/.ci/run.sh
index 88ce0bd9986a1..c747e5844d36e 100755
--- a/.ci/run.sh
+++ b/.ci/run.sh
@@ -10,35 +10,38 @@ source src/dev/ci_setup/extract_bootstrap_cache.sh
 source src/dev/ci_setup/setup.sh
 source src/dev/ci_setup/checkout_sibling_es.sh
 
-case "$JOB" in
-kibana-intake)
-  ./test/scripts/jenkins_unit.sh
-  ;;
-kibana-ciGroup*)
-  export CI_GROUP="${JOB##kibana-ciGroup}"
-  ./test/scripts/jenkins_ci_group.sh
-  ;;
-kibana-visualRegression*)
-  ./test/scripts/jenkins_visual_regression.sh
-  ;;
-kibana-firefoxSmoke*)
-  ./test/scripts/jenkins_firefox_smoke.sh
-  ;;
-x-pack-intake)
-  ./test/scripts/jenkins_xpack.sh
-  ;;
-x-pack-ciGroup*)
-  export CI_GROUP="${JOB##x-pack-ciGroup}"
-  ./test/scripts/jenkins_xpack_ci_group.sh
-  ;;
-x-pack-visualRegression*)
-  ./test/scripts/jenkins_xpack_visual_regression.sh
-  ;;
-x-pack-firefoxSmoke*)
-  ./test/scripts/jenkins_xpack_firefox_smoke.sh
-  ;;
-*)
-  echo "JOB '$JOB' is not implemented."
-  exit 1
-  ;;
-esac
+for _JOB in $(JOB//,/ /)
+do
+  case "$_JOB" in
+  kibana-intake)
+    ./test/scripts/jenkins_unit.sh
+    ;;
+  kibana-ciGroup*)
+    export CI_GROUP="${_JOB##kibana-ciGroup}"
+    ./test/scripts/jenkins_ci_group.sh
+    ;;
+  kibana-visualRegression*)
+    ./test/scripts/jenkins_visual_regression.sh
+    ;;
+  kibana-firefoxSmoke*)
+    ./test/scripts/jenkins_firefox_smoke.sh
+    ;;
+  x-pack-intake)
+    ./test/scripts/jenkins_xpack.sh
+    ;;
+  x-pack-ciGroup*)
+    export CI_GROUP="${_JOB##x-pack-ciGroup}"
+    ./test/scripts/jenkins_xpack_ci_group.sh
+    ;;
+  x-pack-visualRegression*)
+    ./test/scripts/jenkins_xpack_visual_regression.sh
+    ;;
+  x-pack-firefoxSmoke*)
+    ./test/scripts/jenkins_xpack_firefox_smoke.sh
+    ;;
+  *)
+    echo "JOB '$_JOB' is not implemented."
+    exit 1
+    ;;
+  esac
+done