From a9b29161cc1c6cdca46c14d8e8b196c4eb7ad908 Mon Sep 17 00:00:00 2001 From: spalger Date: Wed, 28 Aug 2019 21:08:58 -0700 Subject: [PATCH] Revert "combine jobs to cut down workers and trade time for stability" This reverts commit d8daf9934f7d9afaeecd7440dea0cc63f073a4dc. --- .ci/run.sh | 67 ++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/.ci/run.sh b/.ci/run.sh index c747e5844d36e..88ce0bd9986a1 100755 --- a/.ci/run.sh +++ b/.ci/run.sh @@ -10,38 +10,35 @@ 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 -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 +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