Skip to content
This repository has been archived by the owner on Mar 31, 2024. It is now read-only.

Commit

Permalink
combine jobs to cut down workers and trade time for stability
Browse files Browse the repository at this point in the history
  • Loading branch information
spalger committed Aug 28, 2019
1 parent 9fecf8d commit d8daf99
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 60 deletions.
39 changes: 11 additions & 28 deletions .ci/jobs.yml
Original file line number Diff line number Diff line change
@@ -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: ~
67 changes: 35 additions & 32 deletions .ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit d8daf99

Please sign in to comment.