ATR-21589: Automate the merging strategy

Automatically parse the merging strategy from the alignment dictionary.

Set the default merging to 'auto'.

Remove merging='parallel'/'serial' from all chains in the menu. Changed newJO menu to include 'parallel'.

Auto-merging strategy is setup to allow for chains needing a hybrid strategy, though the serial merging explicitly disallows this case: opened ATR-22206 to follow up.

added 1 commit

• 7ce9ab05 - Fixes for parallel-only chains, cleanup

Compare with previous version

added 1 commit

• c2b1d419 - Add back merging strategy for newJO, which isn't part of the whole alignment strategy jet

Compare with previous version

added 122 commits

• c2b1d419...21a0ba7f - 121 commits from branch atlas:master
• 335f791e - Merge in upstream

Compare with previous version

unmarked as a Work In Progress

changed the description

This merge request affects 1 package:

• Trigger/TriggerCommon/TriggerMenuMT

Adding @bernius as watcher

added Trigger TriggerMenu master review-pending-level-1 labels

I think my merge upstream/master into the branch created a disaster, I might have to start again.

changed title from Automate the merging strategy to ATR-21589: Automate the merging strategy

added 2 commits

• bd535d44 - Remove stray mergingStrategy line from ls2_1
• 6d9c2f81 - Fix merge conflict

Compare with previous version

This merge request affects 1 package:

• Trigger/TriggerCommon/TriggerMenuMT

Adding @bernius as watcher

CI Result FAILURE (hash 335f791e)

	Athena	AthSimulation	AthGeneration	AnalysisBase
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 1, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 22082]

CI Result SUCCESS (hash 6d9c2f81)

	Athena	AthSimulation	AthGeneration	AnalysisBase
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 22090]

added 23 commits

• 6d9c2f81...d5044711 - 22 commits from branch atlas:master
• 5faa07ae - Merge branch 'master' into 'TM-ATR-21589_merging2'

Compare with previous version

This merge request affects 1 package:

• Trigger/TriggerCommon/TriggerMenuMT

Adding @bernius as watcher

CI Result SUCCESS (hash 5faa07ae)

	Athena	AthSimulation	AthGeneration	AnalysisBase
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 22120]

Looks good, although I will bump it to L2 for a second opinion and signoff --L1

added review-pending-level-2 label and removed review-pending-level-1 label

added review-approved label and removed review-pending-level-2 label

merged

mentioned in commit 3456806c

added sweep:ignore label

mentioned in merge request !37645 (closed)