Re: master branch merges must pass unit tests

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Nov 8, 2016 at 6:34 PM, Sage Weil <sage@xxxxxxxxxxxx> wrote:
> On Tue, 8 Nov 2016, Sage Weil wrote:
>> I enabled the github check that the unit tests pass in order to merge to
>> master.  These tests still aren't completely reliable, but they're close,
>> and we'll make better progress if we start enforcing it now.
>
> I went a bit further and also checked the box requiring a review and
> preventing pushes directly to master branch.  These are already uneforced
> requirements so this shouldn't slow people down *except* that we need to
> start using the new github 'review' feature that lets you explicitly
> approve changes.
>
> Again, the core developers can override these restrictions if necessary.
>
> I haven't done anything to the stable branches, but we might want to do
> the same thing there...

I went ahead and tried to merge a simple PR to see what would happen:

https://github.com/ceph/ceph/pull/11904

Before review:

$ git push upstream master
Counting objects: 9, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (9/9), 1.57 KiB | 0 bytes/s, done.
Total 9 (delta 7), reused 8 (delta 7)
remote: Resolving deltas: 100% (7/7), completed with 7 local objects.
remote: error: GH006: Protected branch update failed for refs/heads/master.
remote: error: Required status check "default" is failing. At least
one approved review is required
To github.com:ceph/ceph.git
 ! [remote rejected] master -> master (protected branch hook declined)
error: failed to push some refs to 'git@xxxxxxxxxx:ceph/ceph.git'

Not unexpected, then I did a review.

$ git push upstream master --force
Counting objects: 9, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (9/9), 1.57 KiB | 0 bytes/s, done.
Total 9 (delta 7), reused 8 (delta 7)
remote: Resolving deltas: 100% (7/7), completed with 7 local objects.
remote: error: GH006: Protected branch update failed for refs/heads/master.
remote: error: Required status check "default" is failing.
To github.com:ceph/ceph.git
 ! [remote rejected] master -> master (protected branch hook declined)
error: failed to push some refs to 'git@xxxxxxxxxx:ceph/ceph.git'

(With and without --force, same result.)

My understanding is that only users/teams with admin writes (or
organization owners) on ceph/ceph can push in this situation. Is that
what we want? I don't think we have anyone with admin on ceph/ceph but
maybe I somehow can't see those users/teams.

-- 
Patrick Donnelly
--
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



[Index of Archives]     [CEPH Users]     [Ceph Large]     [Information on CEPH]     [Linux BTRFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux