This repository has been archived by the owner on Feb 21, 2025. It is now read-only.
Added cherry-pick functionality to cmssw_deploy #21
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Leverage the existing cms-show-pr functionality to get (reliably?) the commits of a specific PR, then check what packages it affects and checking those out.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implement functionality that allows using the
-pargument of thecmssw_deployscript to specify PRs to be cherry-picked instead of merged withcms-merge-topic.This is done by leveraging the existing
git cms-show-prfunctionality to (reliably?) get the commits that compose a specific CMSSW PR, applying them on top of whatever CMSSW version we use, finding what packages it affects (withgit show) and checking those out (withgit-cms-addpkg).Helpful in cases where a PR is made against a newer version of CMSSW than
the one we want to apply it to, in which case
cms-merge-topicwould apply manyintermediate commits which we don't want.
Example usage:
cmssw_deploy make-release -t CMSSW_14_0_15 -p +45544 --no-build # Note the '+' before the PR numberPS: It seems that there is also a
git cms-cherry-pick-prcommand which could have been used, but it doesn't seem to properly apply the commits, in case they have already been merged to the base branch (something that this commit does manually, through--allow-empty --keep-redundant-commits).Cases tested:
CMSSW_14_1_5_patch1+ Add Et distributions for BC & SC energy ECAL DQM plots [14_2_X] cms-sw/cmssw#46811 (PR made against14_2_X)CMSSW_14_1_5_patch1+ fix HLT online DQM client to cope with PbPb HLT strip collections cms-sw/cmssw#46622 (PR made againstmaster, 15_0_X at the time)CMSSW_14_1_5_patch1+ refactor: disable DQM pb files production cms-sw/cmssw#46662 (PR made againstmaster, 15_0_X at the time)CMSSW_14_1_5_patch1+ Hepmc3tog4, addind the codes that provide a possibility to transfer HepMC3Product from the GEN step to the SIM step cms-sw/cmssw#46797 (PR made againstmaster, 15_0_X at the time)CMSSW_14_0_15+ Added more ZDC functionality to DQM cms-sw/cmssw#45544 (PR made againstmaster, 14_2_X at the time)