title) echo "PR $pr $title" git -no-pager log -oneline ceph/pull/$pr/merge^1.ceph/pull/$pr/merge^2 git -no-pager merge -no-ff -m "$(echo -e "Merge pull request #$pr: $title\n\nReviewed-by: $reviewer")" ceph/pull/$pr/head done
Git fetch -force ceph $(for ref in $PRS do echo +refs/pull/$ref/head:refs/remotes/ceph/pull/$ref/head echo +refs/pull/$ref/merge:refs/remotes/ceph/pull/$ref/merge done)įor pr in $PRS do eval title=$(curl -silent $pr?access_token=$github_token | jq. Git checkout -b $release-backports ceph/$release | select(.milestone.title = $release) | select(.title | contains("DNM") | not) | | | while read line do The following snippet summarizes all the actions above: This list has links to the individual pull requests for future reference. will produce such a list in a way that can be conveniently copy/pasted in redmine. Using the line starting with git -no-pager log -format='%H %s'. Add a new comment to the issue tracking the progress of the release (see for instance), with the list of commits that are in the integration branch.Push the integration branch to the official repository: git push -force ceph $release-backports (requires write permission to the ceph repository).Via the make check bot by creating a pull request with the $release-backports integration branch.
Verify the integration branch compiles and passes make check.Push the integration branch to github: git push -force origin $release-backports.they must merge cleanly, which may involve aggregating two pull requests into a single one designed to properly resolve the conflict). Modify the pull requests individually to fix merge conflicts (i.e.git merge -no-ff -m "$(echo -e "Merge XXX: $title\n\nReviewed-by: Myself ")" ceph/pull/XXX/head The -no-ff ensures that even if the merge commit could be skipped, it will not be. Merge the pull request in the local integration branch.Get the title of the pull request: eval title=$(curl -silent | jq.Retrieve the commits of the pull request XXX: git fetch -force ceph +refs/pull/XXX/head:refs/remotes/ceph/pull/XXX/head.For finding out the pull requests in github against a milestone Github's api can be queried (see the collect_pr shell function below).Each pull request XXX has its own branch in the official ceph repository, named pull/XXX Reset it to ceph/$release: git reset -hard ceph/$release.Create a $release-backports branch locally if it does not already exists: git checkout -b $release-backports ceph/$release.DNM is prefixed to the title of the ones that do not pass the make check bot, so that they can be ignored (Note that this convention is used by the collect_pr function in the shell snippet at the end of this page). Verify each pull request has a successful make check bot report.Fetch the latest $release : git fetch ceph.hammer for instance) and your local clone has two remotes: origin which is your read/write fork of the official ceph repository and ceph which is the read only official ceph repository.
Let say the release to be tested is $release (i.e.
Do not pollute the release branch with reverted commits (commits would have to be reverted because the stable branch must never be rebased).
#Does git checkout readwrite upgrade
Detect trivial problems that would break the upgrade tests run on the release branch (they are run at the tip of the branch, not at the latest point release).Before a backported commit can be merged into the release branch, it must be tested in an integration branch.
0 kommentar(er)
