diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37aa8b765988391c91ba97f3922c1f69838ee97f..ee3327a99dc01b5437e0e3c791fc8c078fdce847 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ stages:
- data_init
- simulate
- benchmarks
+ - collect
- deploy
env:
@@ -79,9 +80,7 @@ include:
deploy_results:
stage: deploy
needs:
- - ["bench:zdc_benchmark_info_histogram"]
- tags:
- - silicon
+ - ["collect_results:zdc","collect_results:barrel_ecal","collect_results:crystal_calorimeter"]
script:
- echo "deploy results!"
diff --git a/benchmarks/barrel_ecal/config.yml b/benchmarks/barrel_ecal/config.yml
index cedd1e039f8a5ae0697d00159c538c74a83e09a0..81e692930c7e0ecb955398a45f412c02f713464b 100644
--- a/benchmarks/barrel_ecal/config.yml
+++ b/benchmarks/barrel_ecal/config.yml
@@ -1,29 +1,37 @@
-cal_sim:emcal_barrel_pions:
+sim:emcal_barrel_pions:
extends: .det_benchmark
stage: simulate
script:
- bash benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
-cal_sim:emcal_barrel_electrons:
+sim:emcal_barrel_electrons:
extends: .det_benchmark
stage: simulate
script:
- bash benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
-cal_bench:emcal_barrel_pions:
+bench:emcal_barrel_pions:
extends: .det_benchmark
stage: benchmarks
needs:
- - ["cal_sim:emcal_barrel_pions"]
+ - ["sim:emcal_barrel_pions"]
script:
- root -b -q benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx+
-cal_bench:emcal_barrel_electrons:
+bench:emcal_barrel_electrons:
extends: .det_benchmark
stage: benchmarks
needs:
- - ["cal_sim:emcal_barrel_electrons"]
+ - ["sim:emcal_barrel_electrons"]
script:
- rootls -t sim_output/sim_emcal_barrel_uniform_electrons.root
- root -b -q benchmarks/barrel_ecal/scripts/emcal_barrel_electrons_analysis.cxx+
+collect_results:barrel_ecal:
+ extends: .det_benchmark
+ stage: collect
+ needs:
+ - ["bench:emcal_barrel_pions","sim:emcal_barrel_electrons"]
+ script:
+ - ls -lrht
+
diff --git a/benchmarks/crystal_calorimeter/config.yml b/benchmarks/crystal_calorimeter/config.yml
index d4d66996324a079090250295125dafebc06c1769..3b9b29883b8b94388b2e9c8a81f08280f60d7d70 100644
--- a/benchmarks/crystal_calorimeter/config.yml
+++ b/benchmarks/crystal_calorimeter/config.yml
@@ -19,4 +19,12 @@ cal_bench:crystal_benchmark:
- rootls -t sim_output/output_emcal_electrons.root
- echo " Not yet complete"
#- root -b -q benchmarks/cryxtal_calorimeter/simple_checking_crystal.cxx+
+ #
+collect_results:crystal_calorimeter:
+ extends: .det_benchmark
+ stage: collect
+ needs:
+ - ["cal_bench:crystal_benchmark"]
+ script:
+ - ls -lrht
diff --git a/benchmarks/zdc/config.yml b/benchmarks/zdc/config.yml
index 54c1e32d12bca24d053a584e37d203d0b6927721..46bd6e792d81a324735e7cefa87dd00c11267f59 100644
--- a/benchmarks/zdc/config.yml
+++ b/benchmarks/zdc/config.yml
@@ -13,7 +13,7 @@ zdc_neutrons:
- echo " Not yet complete"
#- root -b -q benchmarks/zdc/zdc_neutrons_reader.cxx
-zdc_benchmark:
+bench:zdc_benchmark:
extends: .det_benchmark
stage: benchmarks
needs:
@@ -30,3 +30,10 @@ bench:zdc_benchmark_info_histogram:
script:
- root -b -q benchmarks/zdc/simple_info_plot_histograms.cxx+
+collect_results:zdc:
+ extends: .det_benchmark
+ stage: collect
+ needs:
+ - ["bench:zdc_benchmark","bench:zdc_benchmark_info_histogram"]
+ script:
+ - ls -lrht