Daily "22.0 to master" sweep: 21/10/22
Several conflicts in this sweep
-
Tools/WorkflowTestRunner/python/References.py
. Kept the master version -
MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/MuonClusterSegmentFinderTool.h
. Kept the master version -
Simulation/ISF/ISF_Core/ISF_Event/test/ISFTruthIncident_test.cxx
. Used the version from 22.0, and then patched it to make consistent with the master version prior to the sweep
Merge request reports
Activity
CC @lmijovic
WARNING: big files (>100K) are found in the changeset 176K in file Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref 340K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py 324K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.refThis merge request affects 33 packages:
- AtlasGeometryCommon/SubDetectorEnvelopes
- Control/AthenaConfiguration
- Event/xAOD/xAODTrigger
- InnerDetector/InDetConfig
- InnerDetector/InDetExample/InDetRecExample
- MuonSpectrometer/MuonCnv/MuonNSWCommonDecode
- MuonSpectrometer/MuonDetDescr/MuonNSWAsBuilt
- MuonSpectrometer/MuonDigitization/sTGC_Digitization
- PhysicsAnalysis/HeavyIonPhys/HIEventUtils
- Simulation/Digitization
- Simulation/G4Atlas/G4AtlasAlg
- Simulation/ISF/ISF_Core/ISF_Event
- Simulation/SimuJobTransforms
- Simulation/SimulationJobOptions
- TileCalorimeter/TileConfiguration
- Tools/Campaigns
- Tools/PyUtils
- Tools/WorkflowTestRunner
- Trigger/TrigMonitoring/TrigEgammaMonitoring
- Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream
- Trigger/TrigT1/TrigT1CaloCalibTools
- Trigger/TrigT1/TrigT1CaloMonitoring
- Trigger/TrigT1/TrigT1MuctpiBits
- Trigger/TrigT1/TrigT1MuctpiPhase1
- Trigger/TrigTools/TrigInDetConfig
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TrigInDetValidation
- Trigger/TrigValidation/TrigP1Test
- Trigger/TrigValidation/TrigValTools
- Trigger/TrigValidation/TriggerTest
- Trigger/TriggerCommon/TrigEDMConfig
- Trigger/TriggerCommon/TriggerJobOpts
- Trigger/TriggerCommon/TriggerMenuMT
Affected files list will not be printed in this case
Adding @jchapman ,@ademaria ,@ggonella ,@vmartin ,@okumura ,@carquin ,@jojungge ,@okuprash ,@iouri ,@goetz ,@apsallid ,@pavol ,@sroe ,@pscholer ,@serodrig ,@thompson ,@shanisch ,@lidiaz ,@cjmeyer ,@rbielski ,@rbianchi ,@fernando ,@martindl ,@rosati ,@dbakshig ,@stavrop ,@jodafons ,@gavrilen ,@mvozak ,@solodkov ,@akraszna ,@safarzad ,@malconad ,@bernius ,@gipezzul ,@wleight ,@sutt ,@amorley ,@salderwe ,@iriu ,@nagano ,@harkusha ,@ssnyder ,@tamartin ,@hartj ,@eegidiop as watchers
CI Result FAILURE (hash 62715dd7)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 60711] WARNING: big files (>100K) are found in the changeset 176K in file Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref 340K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py 324K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.refThis merge request affects 33 packages:
- AtlasGeometryCommon/SubDetectorEnvelopes
- Control/AthenaConfiguration
- Event/xAOD/xAODTrigger
- InnerDetector/InDetConfig
- InnerDetector/InDetExample/InDetRecExample
- MuonSpectrometer/MuonCnv/MuonNSWCommonDecode
- MuonSpectrometer/MuonDetDescr/MuonNSWAsBuilt
- MuonSpectrometer/MuonDigitization/sTGC_Digitization
- PhysicsAnalysis/HeavyIonPhys/HIEventUtils
- Simulation/Digitization
- Simulation/G4Atlas/G4AtlasAlg
- Simulation/ISF/ISF_Core/ISF_Event
- Simulation/SimuJobTransforms
- Simulation/SimulationJobOptions
- TileCalorimeter/TileConfiguration
- Tools/Campaigns
- Tools/PyUtils
- Tools/WorkflowTestRunner
- Trigger/TrigMonitoring/TrigEgammaMonitoring
- Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream
- Trigger/TrigT1/TrigT1CaloCalibTools
- Trigger/TrigT1/TrigT1CaloMonitoring
- Trigger/TrigT1/TrigT1MuctpiBits
- Trigger/TrigT1/TrigT1MuctpiPhase1
- Trigger/TrigTools/TrigInDetConfig
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TrigInDetValidation
- Trigger/TrigValidation/TrigP1Test
- Trigger/TrigValidation/TrigValTools
- Trigger/TrigValidation/TriggerTest
- Trigger/TriggerCommon/TrigEDMConfig
- Trigger/TriggerCommon/TriggerJobOpts
- Trigger/TriggerCommon/TriggerMenuMT
Affected files list will not be printed in this case
Adding @jchapman ,@ademaria ,@ggonella ,@vmartin ,@okumura ,@carquin ,@jojungge ,@okuprash ,@iouri ,@goetz ,@apsallid ,@pavol ,@sroe ,@pscholer ,@serodrig ,@thompson ,@shanisch ,@lidiaz ,@cjmeyer ,@rbielski ,@rbianchi ,@fernando ,@martindl ,@rosati ,@dbakshig ,@stavrop ,@jodafons ,@gavrilen ,@mvozak ,@solodkov ,@akraszna ,@safarzad ,@malconad ,@bernius ,@gipezzul ,@wleight ,@sutt ,@amorley ,@salderwe ,@iriu ,@nagano ,@harkusha ,@ssnyder ,@tamartin ,@hartj ,@eegidiop as watchers
CI Result SUCCESS (hash 62715dd7)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 60721]mentioned in commit 407f1ef5
added sweep:ignore label