Daily merge of 22.0 into master, Sept 19

Done using git merge --strategy-option ours upstream/22.0

Conflicts w/o strategy-option:

both modified: AtlasTest/CITest/test/RecoRun3MC.sh

both modified: Projects/Athena/version.txt

both modified: Projects/DetCommon/version.txt

both added: Tools/PROCTools/data/q446_AOD_digest.ref

both modified: Tools/WorkflowTestRunner/python/References.py

I get a conflict when trying to sweep this to master and would appreciate some guidance over which is correct?

<<<<<<< HEAD
    "s3759": "v10",
    "s3760": "v8",
    "s3779": "v4",
    # Overlay
    "d1590": "v11",
    "d1726": "v7",
    "d1759": "v4",
=======
    "s3759": "v2",
    "s3760": "v3",
    "s3779": "v1",
    # Overlay
    "d1590": "v3",
    "d1726": "v4",
    "d1759": "v5",
>>>>>>> upstream/22.0

v13 is the version currently in 22.0 HEAD

Okay, but there are other changes too WRT master:

https://gitlab.cern.ch/atlas/athena/-/blob/master/Tools/WorkflowTestRunner/python/References.py

Can I just replace the version of this file in master with the version in 22.0?

cc @tadej @jchapman @elmsheus @nstyles

AODs are not checked in master, the value can be whatever, ideally the same as in 22.0 to avoid conflicts.

For sim and digi, you should bump version by one and copy the file there (technically you could take the 22.0 version, but metadata may not be exactly the same).

How can the metadata be different if I copy the file? Wouldn't it be simpler just to keep everything identical?

(Sorry, I have to say I don't really know how this file is used)

Actually, I think I should just ignore this file. I don't think it should be updated by a sweep.

Can this change we swept to master?

Yes, just disable AOD comparison with --no-output-checks as it is already set now.

Note that also we'll need new references for sim and overlay which can be copied from the CI results once you run the pipeline.

Okay, thanks.

WARNING: big files (>100K) are found in the changeset

200K in file Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref

328K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

This merge request affects 12 packages:

• AtlasTest/CITest
• PhysicsAnalysis/AnalysisCommon/ParticleJetTools
• Tools/PyUtils
• Trigger/TrigHypothesis/TrigMuonHypo
• Trigger/TrigMonitoring/TrigBjetMonitoring
• Trigger/TrigT1/TrigT1MuctpiBits
• Trigger/TrigT1/TrigT1MuctpiPhase1
• Trigger/TrigT1/TrigT1ResultByteStream
• Trigger/TrigTools/TrigByteStreamTools
• Trigger/TrigValidation/TrigAnalysisTest
• Trigger/TrigValidation/TrigP1Test
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @ademaria ,@ggonella ,@vmartin ,@okumura ,@carquin ,@bernius ,@suyogs ,@malconad ,@fwinkl ,@sekula ,@gipezzul ,@sutt ,@salderwe ,@iriu ,@jveatch ,@hrussell ,@serodrig ,@thompson ,@shanisch ,@rbielski ,@enagy as watchers

added Analysis BTagging DQ JetEtmiss Test Tools Trigger TriggerMenu analysis-review-required changes-trigger-counts master review-pending-level-1 labels

CI integration tests for projects AnalysisBase are cancelled because of compilation error(s)

CI Result FAILURE (hash e4ac2bbb)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 1
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 1, warnings 8
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 59116]

added 1 commit

• 2c5e2640 - Revert "Merge branch 'drlabel-to-decorator' into '22.0'"

Compare with previous version

WARNING: big files (>100K) are found in the changeset

200K in file Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref

328K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

This merge request affects 11 packages:

• AtlasTest/CITest
• Tools/PyUtils
• Trigger/TrigHypothesis/TrigMuonHypo
• Trigger/TrigMonitoring/TrigBjetMonitoring
• Trigger/TrigT1/TrigT1MuctpiBits
• Trigger/TrigT1/TrigT1MuctpiPhase1
• Trigger/TrigT1/TrigT1ResultByteStream
• Trigger/TrigTools/TrigByteStreamTools
• Trigger/TrigValidation/TrigAnalysisTest
• Trigger/TrigValidation/TrigP1Test
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @ademaria ,@shanisch ,@ggonella ,@vmartin ,@okumura ,@carquin ,@bernius ,@suyogs ,@fwinkl ,@sekula ,@gipezzul ,@sutt ,@salderwe ,@iriu ,@hrussell ,@serodrig ,@thompson ,@malconad ,@rbielski ,@enagy as watchers

CI Result SUCCESS (hash 2c5e2640)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
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
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 59149]

changed title from Daily merge ofr 22.0 into master, Sept 19 to Daily merge of 22.0 into master, Sept 19

No idea why commented from the previous merge are here!

Nor why gitlab thinks there's a change in AtlasTest/CITest/test/RecoRun3MC.sh - they seem identical to me!

I think the comments appeared because they are comments on a commit 4bc41e03, not comments on the MR !56793 (merged). I think you removed that commit from your MR later, but it was included here. I didn't track exactly what happened - not sure why it got removed from the previous MR and included here - just making some guesses.

merged

mentioned in commit ddfc50ab

added sweep:ignore label