Ceph » Stable releases

HOWTO backport

Based on what would be done for the Giant branch

Update the inventory¶

• ssh -p2222 backports@workbench.dachary.org
• screen -x
• ( cd .. ; github2gitlab --github-token $github_token --github-repo ceph/ceph --gitlab-url http://workbench.dachary.org --gitlab-token $gitlab_token --gitlab-repo ceph/ceph-backports --branches master,dumpling,emperor,firefly,giant,hammer,firefly-backports,giant-backports,dumpling-backports --verbose )
• ( python ../sanity.py ; cd ../ceph-backports.wiki ; git commit -a -m 'update' ; git push )
• firefox http://workbench.dachary.org/ceph/ceph-backports/wikis/giant

Backport issues¶

The helper snippet at http://workbench.dachary.org/dachary/ceph-workbench/issues/3 can be used to semi automate the process below

• For each entry at http://workbench.dachary.org/ceph/ceph-backports/wikis/giant#issues-that-need-backporting
• git cherry-pick -x the commits from the pull request that was targettig master (not from the pull requests targeting stable branches)
• create a pull request with the backport with a reference to the issue and set the milestone to giant
• add a reference to the pull request in the issue
• if the make check bot finds a problem, fix it

Collect pending pull requests¶

The snippet at http://workbench.dachary.org/dachary/ceph-workbench/issues/4 can help

• create a giant-backport branch
• fetch all pull requests from github
• git merge all pull requests
• modify the pull requests individually to fix merge conflicts (i.e. they must merge cleanly, which may involving aggregating two pull requests into a single one designed to properly resolve the conflict)
• compile with ./autogen.sh ; ./configure ; make -j4
• modify the pull requests individually to fix compilation errors