Skip to content
Snippets Groups Projects

Daily "22.0 to master" sweep: 25/05/22

Merged Adam Edward Barton requested to merge abarton/athena:update_25_05 into master
All threads resolved!

Following discussions we are merging r22 commits on a daily basis in a single merge request.

This was done with the given instructions. No merge conflicts were encountered.

Since this is a 1st attempt I am ccing other RC for their information and comment cc @nstyles @elmsheus @fwinkl @tamartin

Edited by Frank Winklmeier

Merge request reports

Checking pipeline status.

Merged by Adam Edward BartonAdam Edward Barton 2 years ago (May 26, 2022 10:55am UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • :white_check_mark: CI Result SUCCESS (hash 4167b459)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

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

  • Setting review-user-action-required while open threads are being addressed -- L1

  • added 1 commit

    • 2c2bdc3d - Revert "22.0 -> master sweeping rule"

    Compare with previous version

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

    :pencil: 276K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

    :pencil: 160K in file Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref

    :pencil: 140K in file Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx

    :pencil: 236K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

  • This merge request affects 15 packages:

    • Reconstruction/tauRecTools
    • Tools/Tier0ChainTests
    • Trigger/TrigAlgorithms/TrigFastTrackFinder
    • Trigger/TrigAlgorithms/TrigTauRec
    • Trigger/TrigHypothesis/TrigHLTJetHypo
    • Trigger/TrigHypothesis/TrigMuonHypo
    • Trigger/TrigMonitoring/TrigIDtrkMonitoring
    • Trigger/TrigMonitoring/TrigTauMonitoring
    • Trigger/TrigSteer/DecisionHandling
    • Trigger/TrigSteer/HLTSeeding
    • Trigger/TrigTools/TrigInDetConfig
    • Trigger/TrigValidation/TrigAnalysisTest
    • Trigger/TrigValidation/TrigP1Test
    • Trigger/TriggerCommon/TrigEDMConfig
    • Trigger/TriggerCommon/TriggerMenuMT

    Affected files list will not be printed in this case

    Adding @martindl ,@ademaria ,@shanisch ,@ggonella ,@vmartin ,@mvozak ,@carquin ,@xiaozhon ,@ayana ,@bernius ,@okuprash ,@sutt ,@lstocker ,@peter ,@gipezzul ,@cantel ,@goetz ,@salderwe ,@iriu ,@amelo ,@nagano ,@tamartin ,@adbailey ,@okumura ,@malconad ,@rbielski ,@valentem as watchers

  • Adam Edward Barton resolved all threads

    resolved all threads

  • mentioned in commit 45c9ff8a

  • :white_check_mark: CI Result SUCCESS (hash 2c2bdc3d)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

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

  • Please register or sign in to reply
    Loading