Blocking and unblocking merges

Wes Tapp wes.tapp at canonical.com
Fri Dec 19 22:02:19 UTC 2014


There is good and meaningful comment here.  I will be meeting with the QA
team to see if we can expose and continue to refine the process.  We are in
the midst of finishing some reporting, which will help, as well as some
documentation.  I have taken note of the suggestions for better messaging
and reporting in general.

Best,
Wes


On Thu, Dec 18, 2014 at 12:03 AM, John Meinel <john at arbash-meinel.com>
wrote:
>
> ...
>
>
>> > 3. How do merges get unblocked?
>> >
>> > Merges are unblocked when no bugs are returned with the above
>> > criteria. The bugs should be updated only after the committed fix
>> > has successfully passed the CI tests which discovered the
>> > regression. This will most often mean setting the status to 'Fix
>> > Released' when the solution involves code changes or removing the
>> > regression and/or CI tag, if the issue is discovered to be a test
>> > or CI issue.
>>
>
> Note that being "just a test issue" doesn't entirely excuse it, because it
> means that the test suite will just fail again, and we won't have
> visibility into real problems. (We get into a mode where we expect the test
> suite to fail, and stop trusting it.)
>
>
>> >
>> >
>> > 4, If the unblock process involves manual steps, whose
>> > responsibility is it to perform those steps?
>> >
>> > The person or team that marked the bug as a regression is
>> > responsible for updating the bug, once they are satisfied with the
>> > fix. Most often this will be the Juju-QA team but if others
>> > discover a regression they too should have the power to block
>> > merges.
>>
>> The problem often is nobody from QA is around to ask for help in
>> certain times during the day. So there should be at least a person in
>> each team knowing how (and having permissions as well, if needed) to
>> re-run jobs that are stuck, mark the bug as Fix Released once the CI
>> job passes after the fix lands. Another REALLY NEEDED feature is to
>> re-queue PRs set for merging but bounced due to a CI block. This
>> wastes days sometimes, or at the very least hours.
>>
>>
> One thing Tim mentioned was whether we could have the bot comment "I'm not
> merging this now because of a CI failure", but leave the request in the
> Queue, so it is automatically retried when the branch is unblocked. I'm not
> sure if there is an efficiency/event problem (we got an event that the
> $MERGE$ message was set, we wouldn't get another one unless someone pokes
> the branch.) But it does seem possible.
>
> John
> =:->
>
> >
>> >
>> > Based on experience and observation, I think I know how at least
>> > some of this works but could we please have some authoritative
>> > answers?
>> >
>> > Thanks, Menno
>> >
>> >
>> >
>> > -- Juju-dev mailing list Juju-dev at lists.ubuntu.com
>> > <mailto:Juju-dev at lists.ubuntu.com> Modify settings or unsubscribe
>> > at: https://lists.ubuntu.com/mailman/listinfo/juju-dev
>> >
>> >
>> >
>>
>>
>> - --
>> Dimiter Naydenov <dimiter.naydenov at canonical.com>
>> juju-core team
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1
>>
>> iQEcBAEBAgAGBQJUkkBzAAoJENzxV2TbLzHwflIH+wQM8s8oV2i7b1PzsDzh9Zyu
>> DhfkyIhxFQxTJGsV8RamcTDkjWeDhRZKB49UPzMdqNJr0XG/KvVy1SyqICxJ5qoz
>> uWnnrdumzUhF0k/hjsUEnOpNDBOnubUIoGHBVyyx6UEMRgW+G0pFTIhUQGqEPhhU
>> 7YMqn/r3GpiSnkmnknB/U4yk9TEYViDBRuPzSmhJiSwBGqkpOW+ISkWstUgbqYO+
>> o9KzxREWcvEDQ0+v0RLpaF2HsUWwktn7HL2BuoemhU4hoS5/ohD0VR5AemXwUyky
>> ISEiqu4atjPcCxJts5UpPhhznBSVHFlOm4ROkH1ku+x671WZEZZXoUt4CjWbxvo=
>> =l5mJ
>> -----END PGP SIGNATURE-----
>>
>> --
>> Juju-dev mailing list
>> Juju-dev at lists.ubuntu.com
>> Modify settings or unsubscribe at:
>> https://lists.ubuntu.com/mailman/listinfo/juju-dev
>>
>
> --
> Juju-dev mailing list
> Juju-dev at lists.ubuntu.com
> Modify settings or unsubscribe at:
> https://lists.ubuntu.com/mailman/listinfo/juju-dev
>
>

-- 
Wes Tapp
Juju QA & Release Manager
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/juju-dev/attachments/20141219/bc6d758c/attachment-0001.html>


More information about the Juju-dev mailing list