atlas_git_merge: new release branch merge script

Add a new (Python) git merge script for release branch merging. The script tries to automatically handle the sweep:ignore MRs. The corresponding warning from the release notes script has been removed.

Usage (same as before):

./Build/AtlasBuildScripts/atlas_git_merge.py 24.0

This tries to implement the prescription from @tsulaia that was discussed over e-mail. cc @atlas-release-coordinators

Note: For testing this new script it's easiest to have a separate athena checkout of this branch.

mentioned in merge request !78785 (closed)

added 1 commit

• e58d48d8 - atlas_git_merge: new release branch merge script

Compare with previous version

Hi @fwinkl, here is yet another corner case for you. Prompted by !78710 (merged), which renames several files. I'm not sure what would be the best approach for dealing with renamed files in sweep:ignore merge requests. In the latest sweep, I used a sequence of commands for restoring the files with old names and removing the files with new names.

added 1 commit

• b56a9709 - atlas_git_merge.py: try to handle file renames

Compare with previous version

@abarton please try this new merging script this week and post any problems you may find.

added 1 commit

• caa837e9 - atlas_git_merge.py: try to handle file renames

Compare with previous version

changed the description

mentioned in merge request !78922 (merged)

added 1 commit

• 378e1ae0 - Minor changes and adding test script

Compare with previous version

added 1 commit

• 95930e77 - Minor changes and adding test script

Compare with previous version

mentioned in merge request !78956 (merged)

mentioned in merge request !79008 (merged)

mentioned in merge request !78913 (merged)

@tstreble please use this new script here for the sweeps. It's been used the last two weeks, so I am going to finalize this and also update our documentation.

added 593 commits

• 95930e77...0aafe0c7 - 591 commits from branch atlas:main
• dcb9b741 - prepare_release_notes: remove sweep:ignore warning
• 5ca6e0b4 - atlas_git_merge: new release branch merge script

Compare with previous version

marked this merge request as ready

changed the description

resolved all threads

Build area was cleaned as per request posted in the DB. The full software build will be performed

This merge request affects 1 package:

• Build

This merge request affects 3 files:

• Build/AtlasBuildScripts/atlas_git_merge.py
• Build/AtlasBuildScripts/prepare_release_notes.py
• Build/AtlasBuildScripts/test/test_atlas_git_merge.sh

Adding @akraszna as watcher

added Build main review-pending-level-1 labels

mentioned in commit atlas/software-docs/atlas-software-docs@c584f533

mentioned in merge request atlas/software-docs/atlas-software-docs!94 (merged)

mentioned in commit atlas/software-docs/atlas-software-docs@dd4a993a

CI Result FAILURE (hash 5ca6e0b4)

	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 (remote access info)

Unrelated EFTRACK-524 failure

Changes are fine and CI fail is unrelated, approving for L1. -L1

added analysis-review-approved review-approved labels

removed analysis-review-approved label

added review-user-action-required label and removed review-pending-level-1 label

removed review-user-action-required label

mentioned in commit 3ca1c137

merged

Is there a way by chance to get the script from a sparse checkout? AtlasBuildScripts doesn't seem to be accessible with

git atlas addpkg AtlasBuildScripts

# [git-atlas manage-pkg] Called with action 'addpkg' and package name 'AtlasBuildScripts'
Error: no pakage named AtlasBuildScripts found in repository.

resolved all threads