mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 09:48:58 -04:00
combine jobs to cut down workers and trade time for stability
This commit is contained in:
parent
9fecf8df8a
commit
d8daf9934f
2 changed files with 46 additions and 60 deletions
39
.ci/jobs.yml
39
.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: ~
|
||||
|
|
67
.ci/run.sh
67
.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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue