On 27/10/2016 13:19, Abhishek L wrote: > > Loic Dachary writes: > >> On 27/10/2016 12:19, Nathan Cutler wrote: >>> On 10/27/2016 12:02 PM, Loic Dachary wrote: >>>> Hi Abhishek & Nathan & Abhishek, >>>> >>>> Hopefully jewel will start testing with QE tomorrow or early next week. >>>> >>>> In the past we kept backporting but we were very careful not to merge anything because the release process is not able to work with a SHA1, it will create the next jewel release with whatever is at the tip of that branch. This limitation has been there for years and there is little chance that it will be resolved any time soon. It routinely creates frustration when something is merged by accident and tests have to be run again (or worse: they are not run and the release is done anyway). It also creates extra work for the backporters who need to collect backports that could have been merged because they passed the tests. >>>> >>>> Instead, I propose that we backport, test and merge to wip-jewel, as if it was the jewel branch, until the release is done. And when it's done we rebase wip-jewel on top of jewel (or we verify that there is no need to rebase), we push all commits from wip-jewel to jewel, we delete the wip-jewel branch and we resume backporting to the jewel branch. >>>> >>>> In a nutshell it means we have a little extra work: >>>> >>>> a) re-targeting backports to wip-jewel in each PR (which is now possible with github) >>>> b) pushing wip-jewel to jewel after the release and re-targeting backports to jewel >>>> >>>> And the benefits are that >>>> >>>> a) we don't have to stop merging while QE runs tests and the release is prepared, which takes a few weeks >>>> b) there is no risk of an accidental merge that would break the release process >>>> >>>> What do you think ? >>> >>> I wouldn't say it completely removes the risk of an accidental merge to jewel, but it certainly reduces it :-) > > +1 > Let's do it. Yeah ! >> >> :-) One would have to a) open a PR against jewel, b) not be noticed by someone from the backport team, c) be merged by someone who is not aware of the new convention. It's indeed not impossible. >> >>> Anyway, it sounds good to me. The only awkwardness is that it will require existing backport PRs to be closed and reopened (AFAIK there is no other way to "retarget" a PR to a different branch). >> >> It is now possible, when you click "Edit" on the PR title you also have the option to change the target branch of the PR. > > Nice, other note is for others who may send in PRs at this > time for jewel branch, we may need to do this until 10.2.4 is released True. It's low overhead though and we review every PR to check/add cross reference anyway so the burden is not high :-) Cheers -- Loïc Dachary, Artisan Logiciel Libre -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
