[CI] Overlaps exceptions and CI, fix for #2931 and sub-issues
- Re-enables the setup overlaps check in the CI to prevent new overlaps from being introduced due to usage of incompatible detectors geometries in setups
- Introduces agreed upon exceptions for the existing default setups
Draft status due to following points:
-
Missing a solution to run the overlap checks only when there is an update of the geometry repository hash to avoid waste of CI CPU power and time
(test cannot be performed in geo repo CI as CBM libraries are needed to create the setup from the individual detector geometries) -
Missing a geometry hash update to fix the problems with the APR21
setups, either CbmSoft/cbmroot_geometry!237 (closed) or CbmSoft/cbmroot_geometry!238 (merged) (#2936)
=> Hash update included inadvertently in !1482 (merged)
=> This MR will therefore not trigger anymore the new CI tests for most recent pipelines as it does not include anymore a geo Hash change
=> See pipeline #25533 for the last successful pipeline with these tests -
Missing either an exception for the RICH vs magnet overlap in sis100_electron_DEC21
or a hash update with the removal (deprecation) of theDEC21
setups (#2935)
Redmine Refs #2931, #2932, #2933, #2934, #2935, #2936
Of interest to
- @e.clerkin @v.friese @i.selyuzhenkov (Exceptions and setups modifications/removals)
- @f.uhlig (CI chain tuning)
Merge request reports
Activity
requested review from @e.clerkin
assigned to @f.uhlig
added 27 commits
-
81c89e79...d330f18b - 22 commits from branch
computing:master
- 00e09389 - [CI] Enable detection of overlaps in all geo-setups
- cf4af9a7 - Add exception for MVD internal overlap in setups check macro Refs #2934
- ea28d7cb - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 93a49d81 - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- 12280ad7 - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
Toggle commit list-
81c89e79...d330f18b - 22 commits from branch
added 1 commit
- 7d6072c3 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 1 commit
- 9d829ba5 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 1 commit
- ae809666 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 1 commit
- eb1c3329 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 1 commit
- 40cb16eb - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 1 commit
- 94d23d19 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 1 commit
- 995b1436 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 1 commit
- cb2cd639 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 1 commit
- a67af222 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 1 commit
- 2c61e9c1 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 1 commit
- 999f2cdb - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 1 commit
- 835e0f7f - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
added 8 commits
-
6f097990 - 1 commit from branch
computing:master
- eba1fcc1 - [CI] Enable detection of overlaps in all geo-setups
- f89aa131 - Add exception for MVD internal overlap in setups check macro Refs #2934
- e6d66915 - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 0daac3f6 - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- 6217eeff - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- b312d496 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
- 3bb0376b - DO NOT MERGE! [Temp] change geo repo hash to fork to setup checks enabling
Toggle commit list-
6f097990 - 1 commit from branch
Sorry for the spam with the multiple force-pushes and failed pipelines today, I had to fight more than I had expected with the Gitlab CI config and runners.
Nonetheless I managed to achieve the target:
- The setup level geometry checks are not run by default on all CI runners (which avoids always running the material checks as before)
- There is a check done only for
run4
to see if the Install cmake file of the Geometry repository was modified relative the main master - Only if this is the case does
run4
check both the materials and overlaps consistencies ofall and any setup
provided in the repository.
This should allow to both keep the typical CI pipeline duration under control while catching potential troubles with the setups.
The only thing remaining to remove the
Draft
status is to replace theTEMP
commit with a valid geometry repository hash update, once the decisions on which changes to apply to theAPR21
andDEC21
setups are taken.added 15 commits
-
3bb0376b...511c2dad - 7 commits from branch
computing:master
- 002d49ed - Add exception for MVD internal overlap in setups check macro Refs #2934
- ea85674e - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 797f8ad0 - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- b83e11a0 - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- 8a15c915 - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- d6a5d556 - [externals] Bump Geo repo hash to remove the APR21 setups
- 6d7d9c32 - [CI] Enable detection of overlaps in all geo-setups
- 3e454bc1 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
3bb0376b...511c2dad - 7 commits from branch
marked the checklist item Missing a geometry hash update to fix the problems with the
APR21
setups, either CbmSoft/cbmroot_geometry!237 (closed) or CbmSoft/cbmroot_geometry!238 (merged) (#2936) as completedmarked the checklist item Missing either an exception for the RICH vs magnet overlap in
sis100_electron_DEC21
or a hash update with the removal (deprecation) of theDEC21
setups (#2935) as completedI chose to add exceptions for the RICH/Magnet overlaps in DEC21 setups, as it was easier and probably safe
MR now ready, but has
- to wait for !1460 (merged) to be merged due to the "later" geo hash update
- to be locally rebased because of conflict due to this same geo hash update
added 9 commits
-
df38a54b - 1 commit from branch
computing:master
- 642fc557 - Add exception for MVD internal overlap in setups check macro Refs #2934
- 61c2bc4d - Add exception for beampipe internal overlap in setups check macro Refs #2933
- b4cc4f77 - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- 4b211466 - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- b12c7465 - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- fe4f7763 - [externals] Bump Geo repo hash to remove the APR21 setups
- 9a84d533 - [CI] Enable detection of overlaps in all geo-setups
- d8e9403e - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
df38a54b - 1 commit from branch
Dear @f.uhlig, @v.friese, @p.-a.loizeau,
you have been identified as code owner of at least one file which was changed with this merge request.
Please check the changes and approve them or request changes.
added CodeOwners label
added 10 commits
-
d8e9403e...7bc1ea7c - 2 commits from branch
computing:master
- 03d67bce - Add exception for MVD internal overlap in setups check macro Refs #2934
- 22827afc - Add exception for beampipe internal overlap in setups check macro Refs #2933
- ff052827 - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- 5bf073a5 - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- 9876e3ef - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- 5fd7165d - [externals] Bump Geo repo hash to remove the APR21 setups
- 8901766f - [CI] Enable detection of overlaps in all geo-setups
- 81d1ae11 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
d8e9403e...7bc1ea7c - 2 commits from branch
added 9 commits
-
576e58b3 - 1 commit from branch
computing:master
- 81514031 - Add exception for MVD internal overlap in setups check macro Refs #2934
- e295dd92 - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 05ce25bd - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- 5517a9fb - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- c9abedfd - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- 41f8b020 - [externals] Bump Geo repo hash to remove the APR21 setups
- 4da1608c - [CI] Enable detection of overlaps in all geo-setups
- c1b032f7 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
576e58b3 - 1 commit from branch
mentioned in merge request !1482 (merged)
added 10 commits
-
c1b032f7...3f40a840 - 3 commits from branch
computing:master
- d4263c70 - Add exception for MVD internal overlap in setups check macro Refs #2934
- cf54224d - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 5eaea75b - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- 1cc96173 - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- 3bf98367 - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- bb719f91 - [CI] Enable detection of overlaps in all geo-setups
- 6cee469d - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
c1b032f7...3f40a840 - 3 commits from branch
added 12 commits
-
6cee469d...fa6e31d8 - 5 commits from branch
computing:master
- a222eaeb - Add exception for MVD internal overlap in setups check macro Refs #2934
- 8b2c75c9 - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 902c3bcf - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- 73d3bfe1 - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- 1a90320c - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- 3c6ed0b8 - [CI] Enable detection of overlaps in all geo-setups
- b255e3a8 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
6cee469d...fa6e31d8 - 5 commits from branch
added 11 commits
-
b255e3a8...1184b1f3 - 4 commits from branch
computing:master
- c4c76334 - Add exception for MVD internal overlap in setups check macro Refs #2934
- 7660e9d1 - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 75554bba - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- 33873666 - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- 3cfb5aa7 - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- 159dde53 - [CI] Enable detection of overlaps in all geo-setups
- 79d7eecb - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
b255e3a8...1184b1f3 - 4 commits from branch
added 14 commits
-
79d7eecb...caa1f8cf - 7 commits from branch
computing:master
- 8feff5d9 - Add exception for MVD internal overlap in setups check macro Refs #2934
- 8958bb35 - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 96cd6d2d - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- f67de1ea - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- 4f0b908a - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- 9249029e - [CI] Enable detection of overlaps in all geo-setups
- 637e6eb6 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
79d7eecb...caa1f8cf - 7 commits from branch
added 57 commits
-
637e6eb6...64567da6 - 50 commits from branch
computing:master
- 42ab88a6 - Add exception for MVD internal overlap in setups check macro Refs #2934
- 2ab7aef9 - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 8ce516c0 - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- 715208c8 - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- 9bc9c05f - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- a18136d1 - [CI] Enable detection of overlaps in all geo-setups
- d18f1a29 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
637e6eb6...64567da6 - 50 commits from branch
- Resolved by Eoin Clerkin
could you approve the MR such that it can be merged.
added 51 commits
-
d18f1a29...ac2ebc92 - 44 commits from branch
computing:master
- 629a97d5 - Add exception for MVD internal overlap in setups check macro Refs #2934
- addbef19 - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 01d1134d - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- 0cbe504b - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- c952ca6f - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- 1ff354f8 - [CI] Enable detection of overlaps in all geo-setups
- d93768e0 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
d18f1a29...ac2ebc92 - 44 commits from branch
added 35 commits
-
d93768e0...63eb442b - 28 commits from branch
computing:master
- b0f1edd2 - Add exception for MVD internal overlap in setups check macro Refs #2934
- 646a01f6 - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 8c778bd5 - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- fe8c7ce3 - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- 2d3b43b8 - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- 6637d49f - [CI] Enable detection of overlaps in all geo-setups
- a68d0975 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
d93768e0...63eb442b - 28 commits from branch
added 9 commits
-
a68d0975...fb3b4202 - 2 commits from branch
computing:master
- d42cfa87 - Add exception for MVD internal overlap in setups check macro Refs #2934
- e82d7b6f - Add exception for beampipe internal overlap in setups check macro Refs #2933
- 16b2f67c - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- b6dd3a57 - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- 852f918d - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- 49ad6479 - [CI] Enable detection of overlaps in all geo-setups
- 6636328a - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
a68d0975...fb3b4202 - 2 commits from branch
enabled an automatic merge when the pipeline for 6636328a succeeds
enabled an automatic merge when the pipeline for 6636328a succeeds
added 8 commits
-
1a546438 - 1 commit from branch
computing:master
- b8dd67b0 - Add exception for MVD internal overlap in setups check macro Refs #2934
- d6d1bc55 - Add exception for beampipe internal overlap in setups check macro Refs #2933
- f773a3f9 - Add exception for RICH-beampipe overlap in setups check macro Refs #2933
- 381bcf45 - Add exception for RICH v23a internals overlaps in setups check macro Refs #2932
- 6fc45aba - Add except. RICH v21a overlaps w/ magnet 21a (DEC21) in check macro Refs #2932
- 2749c91f - [CI] Enable detection of overlaps in all geo-setups
- 35d23898 - [CI/CDASH] Run geo setups tests only for Nightly/Weekly or on run4 if geo hash change
Toggle commit list-
1a546438 - 1 commit from branch
enabled an automatic merge when the pipeline for 35d23898 succeeds