Re: [OMPI devel] Sample of merging ompi and ompi-release

2016-09-20 Thread Jeff Squyres (jsquyres) 
We talked about this on the call today.

SHORT VERSION
=

I'll merge ompi and ompi-release in the very near future (next 48 hours).  Any 
PRs still open on the ompi-release repo will need to be re-opened on the ompi 
repo by their respective authors.

MORE DETAIL
===

The ompi-all-branches repo seems to have all the functionality that we want (we 
tried it out with a few PRs today):

- Anyone can PR on master and merge when they want to
- Anyone can PR on release branches, and set labels, milestones, and assign
- Anyone can review any PR.  Reviews are *required* on release branches (but 
not master)
- When you review, you can approve the PR or request changes
- Requesting changes blocks PRs on release branches
- Requesting changes will NOT block PRs on master

As a result, there does not seem to be a need for the ompi-release-bot any 
more.  Specifically: code reviews will use the Github mechanism to approve a PR 
or request changes.  The "reviewed" and "pushed-backed" labels will now become 
moot on the release branches.  They might still be useful on master...?  We'll 
see how this plays out. 

*** To be 100% clear: adding a ":+1:" or ":-1:" in a comment is no longer 
sufficient.

We have always required code reviews on release branches; Github now gives us 
technology to enforce that requirement.  Everyone seems cool with this.

Therefore, the plan moving forward will be:

1. merge all the branches and tags of ompi-release into ompi
2. set the code review / writability options on ompi repo just like they are on 
the sandbox ompi-all-the-branches repo
3. delete the ompi-all-the-branches sandbox repo
4. I will "git rm -r *" on all release branches in ompi-release, and leave a 
short README.md explaining that everything has moved back to ompi
5. the ompi-release repo will be kept around so that we have a history of all 
the PRs that have occurred there (and links won't be broken)
6. any open PRs on ompi-release will be closed without merging (they'll become 
invalid at step #4, anyway).
7. authors of such closed-and-not-merged ompi-release PRs will need to re-open 
the PRs on the ompi repo if they still want them to go into the release 
branches.  We highly suggest including a link to the prior PR (i.e., the one on 
the ompi-release repo) to point to old conversations/comments/etc.




> On Sep 20, 2016, at 7:01 AM, Gilles Gouaillardet 
>  wrote:
> 
> Ralph,
> 
> On the ompi-release repo, developers with no write permissions (e.g. all but 
> RM, GK and admin) cannot set label nor milestone nor assign PR. The bot was a 
> creative way to work around this limitation.
> IIRC, the bot does not accept instructions from non Open MPI developers.
> 
> The new "review" feature can be a replacement of the bot interpreting thumbs 
> up/down.
> 
> I had no time me to check the unified repo, so I did not check who can set 
> label/milestone/assignment and review PR vs the release branches.
> If developer can do that, then the bot is no more necessary.
> That being said, I am happy to keep help maintaining it for those, including 
> myself, that are more comfortable with typing text rather than clicking a web 
> interface.
> 
> Cheers,
> 
> Gilles
> 
> On Tuesday, September 20, 2016, r...@open-mpi.org  wrote:
> One question, to be discussed on the webex: now that github has a “reviewed” 
> feature, so we still need/want the “thumbs-up” bot? If we retain it, then how 
> do we deal with the non-sync’d, duplicative mechanisms?
> 
> 
>> On Sep 19, 2016, at 4:23 PM, George Bosilca  wrote:
>> 
>> :+1:
>> 
>>   George.
>> 
>> 
>> On Mon, Sep 19, 2016 at 6:56 PM, Jeff Squyres (jsquyres) 
>>  wrote:
>> (we can discuss all of this on the Webex tomorrow)
>> 
>> Here's a sample repo where I merged ompi and ompi-release:
>> 
>> https://github.com/open-mpi/ompi-all-the-branches
>> 
>> Please compare it to:
>> 
>> https://github.com/open-mpi/ompi
>> and https://github.com/open-mpi/ompi-release
>> 
>> It's current to as of within the last hour or so.
>> 
>> Feel free to make dummy commits / pull requests on this rep.  It's a sandbox 
>> repo that will eventually be deleted; it's safe to make whatever changes you 
>> want on this repo.
>> 
>> Notes:
>> 
>> - All current OMPI developers have been given the same push/merge access on 
>> master
>> - Force pushes are disabled on *all* branches
>> - On release branches:
>> - Pull requests cannot be merged without at least 1 review
>>   *** ^^^ This is a new Github feature
>> - Only the gatekeeper team can merge PRs
>> 
>> If no one sees any problem with this sandbox repo, I can merge all the 
>> ompi-release branches to the ompi repo as soon as tomorrow, and config the 
>> same settings.
>> 
>> --
>> Jeff Squyres
>> jsquy...@cisco.com
>> For corporate legal information go to: 
>> http://www.cisco.com/web/about/doing_business/legal/cri/
>> 
>>

Re: [OMPI devel] Sample of merging ompi and ompi-release

2016-09-20 Thread Gilles Gouaillardet 
Ralph,

On the ompi-release repo, developers with no write permissions (e.g. all
but RM, GK and admin) cannot set label nor milestone nor assign PR. The bot
was a creative way to work around this limitation.
IIRC, the bot does not accept instructions from non Open MPI developers.

The new "review" feature can be a replacement of the bot interpreting
thumbs up/down.

I had no time me to check the unified repo, so I did not check who can set
label/milestone/assignment and review PR vs the release branches.
If developer can do that, then the bot is no more necessary.
That being said, I am happy to keep help maintaining it for those,
including myself, that are more comfortable with typing text rather than
clicking a web interface.

Cheers,

Gilles

On Tuesday, September 20, 2016, r...@open-mpi.org  wrote:

> One question, to be discussed on the webex: now that github has a
> “reviewed” feature, so we still need/want the “thumbs-up” bot? If we retain
> it, then how do we deal with the non-sync’d, duplicative mechanisms?
>
>
> On Sep 19, 2016, at 4:23 PM, George Bosilca  > wrote:
>
> :+1:
>
>   George.
>
>
> On Mon, Sep 19, 2016 at 6:56 PM, Jeff Squyres (jsquyres) <
> jsquy...@cisco.com >
> wrote:
>
>> (we can discuss all of this on the Webex tomorrow)
>>
>> Here's a sample repo where I merged ompi and ompi-release:
>>
>> https://github.com/open-mpi/ompi-all-the-branches
>>
>> Please compare it to:
>>
>> https://github.com/open-mpi/ompi
>> and https://github.com/open-mpi/ompi-release
>>
>> It's current to as of within the last hour or so.
>>
>> Feel free to make dummy commits / pull requests on this rep.  It's a
>> sandbox repo that will eventually be deleted; it's safe to make whatever
>> changes you want on this repo.
>>
>> Notes:
>>
>> - All current OMPI developers have been given the same push/merge access
>> on master
>> - Force pushes are disabled on *all* branches
>> - On release branches:
>> - Pull requests cannot be merged without at least 1 review
>>   *** ^^^ This is a new Github feature
>> - Only the gatekeeper team can merge PRs
>>
>> If no one sees any problem with this sandbox repo, I can merge all the
>> ompi-release branches to the ompi repo as soon as tomorrow, and config the
>> same settings.
>>
>> --
>> Jeff Squyres
>> jsquy...@cisco.com 
>> For corporate legal information go to: http://www.cisco.com/web/about
>> /doing_business/legal/cri/
>>
>> ___
>> devel mailing list
>> devel@lists.open-mpi.org
>> 
>> https://rfd.newmexicoconsortium.org/mailman/listinfo/devel
>>
>
> ___
> devel mailing list
> devel@lists.open-mpi.org
> 
> https://rfd.newmexicoconsortium.org/mailman/listinfo/devel
>
>
>
___
devel mailing list
devel@lists.open-mpi.org
https://rfd.newmexicoconsortium.org/mailman/listinfo/devel

Re: [OMPI devel] Sample of merging ompi and ompi-release

2016-09-19 Thread r...@open-mpi.org 
One question, to be discussed on the webex: now that github has a “reviewed” 
feature, so we still need/want the “thumbs-up” bot? If we retain it, then how 
do we deal with the non-sync’d, duplicative mechanisms?


> On Sep 19, 2016, at 4:23 PM, George Bosilca  wrote:
> 
> :+1:
> 
>   George.
> 
> 
> On Mon, Sep 19, 2016 at 6:56 PM, Jeff Squyres (jsquyres)  > wrote:
> (we can discuss all of this on the Webex tomorrow)
> 
> Here's a sample repo where I merged ompi and ompi-release:
> 
> https://github.com/open-mpi/ompi-all-the-branches 
> 
> 
> Please compare it to:
> 
> https://github.com/open-mpi/ompi 
> and https://github.com/open-mpi/ompi-release 
> 
> 
> It's current to as of within the last hour or so.
> 
> Feel free to make dummy commits / pull requests on this rep.  It's a sandbox 
> repo that will eventually be deleted; it's safe to make whatever changes you 
> want on this repo.
> 
> Notes:
> 
> - All current OMPI developers have been given the same push/merge access on 
> master
> - Force pushes are disabled on *all* branches
> - On release branches:
> - Pull requests cannot be merged without at least 1 review
>   *** ^^^ This is a new Github feature
> - Only the gatekeeper team can merge PRs
> 
> If no one sees any problem with this sandbox repo, I can merge all the 
> ompi-release branches to the ompi repo as soon as tomorrow, and config the 
> same settings.
> 
> --
> Jeff Squyres
> jsquy...@cisco.com 
> For corporate legal information go to: 
> http://www.cisco.com/web/about/doing_business/legal/cri/ 
> 
> 
> ___
> devel mailing list
> devel@lists.open-mpi.org 
> https://rfd.newmexicoconsortium.org/mailman/listinfo/devel 
> 
> 
> ___
> devel mailing list
> devel@lists.open-mpi.org
> https://rfd.newmexicoconsortium.org/mailman/listinfo/devel

___
devel mailing list
devel@lists.open-mpi.org
https://rfd.newmexicoconsortium.org/mailman/listinfo/devel

Re: [OMPI devel] Sample of merging ompi and ompi-release

2016-09-19 Thread George Bosilca 
:+1:

  George.


On Mon, Sep 19, 2016 at 6:56 PM, Jeff Squyres (jsquyres)  wrote:

> (we can discuss all of this on the Webex tomorrow)
>
> Here's a sample repo where I merged ompi and ompi-release:
>
> https://github.com/open-mpi/ompi-all-the-branches
>
> Please compare it to:
>
> https://github.com/open-mpi/ompi
> and https://github.com/open-mpi/ompi-release
>
> It's current to as of within the last hour or so.
>
> Feel free to make dummy commits / pull requests on this rep.  It's a
> sandbox repo that will eventually be deleted; it's safe to make whatever
> changes you want on this repo.
>
> Notes:
>
> - All current OMPI developers have been given the same push/merge access
> on master
> - Force pushes are disabled on *all* branches
> - On release branches:
> - Pull requests cannot be merged without at least 1 review
>   *** ^^^ This is a new Github feature
> - Only the gatekeeper team can merge PRs
>
> If no one sees any problem with this sandbox repo, I can merge all the
> ompi-release branches to the ompi repo as soon as tomorrow, and config the
> same settings.
>
> --
> Jeff Squyres
> jsquy...@cisco.com
> For corporate legal information go to: http://www.cisco.com/web/
> about/doing_business/legal/cri/
>
> ___
> devel mailing list
> devel@lists.open-mpi.org
> https://rfd.newmexicoconsortium.org/mailman/listinfo/devel
>
___
devel mailing list
devel@lists.open-mpi.org
https://rfd.newmexicoconsortium.org/mailman/listinfo/devel

[OMPI devel] Sample of merging ompi and ompi-release

2016-09-19 Thread Jeff Squyres (jsquyres) 
(we can discuss all of this on the Webex tomorrow)

Here's a sample repo where I merged ompi and ompi-release:

https://github.com/open-mpi/ompi-all-the-branches

Please compare it to:

https://github.com/open-mpi/ompi
and https://github.com/open-mpi/ompi-release

It's current to as of within the last hour or so.

Feel free to make dummy commits / pull requests on this rep.  It's a sandbox 
repo that will eventually be deleted; it's safe to make whatever changes you 
want on this repo.

Notes:

- All current OMPI developers have been given the same push/merge access on 
master
- Force pushes are disabled on *all* branches
- On release branches:
- Pull requests cannot be merged without at least 1 review
  *** ^^^ This is a new Github feature
- Only the gatekeeper team can merge PRs

If no one sees any problem with this sandbox repo, I can merge all the 
ompi-release branches to the ompi repo as soon as tomorrow, and config the same 
settings.

-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to: 
http://www.cisco.com/web/about/doing_business/legal/cri/

___
devel mailing list
devel@lists.open-mpi.org
https://rfd.newmexicoconsortium.org/mailman/listinfo/devel