Bug 544974 - Pull request blocked although new ip check passes
Summary: Pull request blocked although new ip check passes
Status: CLOSED FIXED
Alias: None
Product: Community
Classification: Eclipse Foundation
Component: GitHub (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Eclipse Webmaster CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-03-02 04:51 EST by Christian Kaltepoth CLA
Modified: 2019-03-12 06:23 EDT (History)
2 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Christian Kaltepoth CLA 2019-03-02 04:51:17 EST
Hi,

we have a problem merging the following pull request:

https://github.com/eclipse-ee4j/krazo/pull/54

The new IP check hook 'eclipsefdn/eca' is already enabled for this project and passes without problems. However, there is also still the old 'ip-validation' check which is hanging and still seems to be marked as a required check and therefore blocks this PR.

Could you perhaps either fully remove the old 'ip-validation' check or mark it as not being mandatory in the protected branch settings of the 'master' branch? 

Thanks a lot
Comment 1 Mikaël Barbero CLA 2019-03-04 08:03:57 EST
We've removed the ip-validation check on all repositories on Feb 27th (see bug 540694 comment 22). It seems to match with the last update of the PR. As an admin, I cannot just remove the check. Stays 2 solutions:

- either update the PR so that the old "ip-validation" check is removed (I hope, I don't know wether github re-execute the same list of checks on PR updates or if it re-read the list of checks from repo settings).
- As an admin, I may still merge this pull request on your behalf. 

Let me know.
Comment 2 Christian Kaltepoth CLA 2019-03-04 11:13:36 EST
Thanks a lot! I'll ask the author of the PR to add another commit. Let's see if this fixes the problem.
Comment 3 Christian Kaltepoth CLA 2019-03-06 02:04:58 EST
Looks like rebasing and doing forced pushes doesn't help.

Could you perhaps merge this pull request with your admin privileges as proposed? That would be awesome! Thanks a lot!
Comment 4 Mikaël Barbero CLA 2019-03-06 05:10:36 EST
I've done better: I've granted you temporary admin privileges to allow you to merge the PR. 

Please comment back on this bug once you're done so that I can remove admin privileges.
Comment 5 Mikaël Barbero CLA 2019-03-06 05:13:26 EST
(this way, you will still be the committer of the merge commit, and not "eclipsewebmaster")
Comment 6 Christian Kaltepoth CLA 2019-03-06 05:47:47 EST
Thanks a lot! I was able to merge the PR. You can now revoke the admin permissions from my account. Thanks for your help.
Comment 7 Mikaël Barbero CLA 2019-03-06 05:51:11 EST
Thanks. I've removed the admin permissions.
Comment 8 Christian Kaltepoth CLA 2019-03-12 03:46:56 EDT
Looks like the issue is not solved yet. :-(

https://github.com/eclipse-ee4j/krazo/pull/55

This pull request has been created a few hours ago and the old ip-validation check is still present.

Maybe the old check is still present because we requested to mark it as a required check for the master branch in the branch protection settings back then? (see #543845)
Comment 9 Mikaël Barbero CLA 2019-03-12 04:28:42 EDT
(In reply to Christian Kaltepoth from comment #8)
> Looks like the issue is not solved yet. :-(
> 
> https://github.com/eclipse-ee4j/krazo/pull/55
> 
> This pull request has been created a few hours ago and the old ip-validation
> check is still present.
> 
> Maybe the old check is still present because we requested to mark it as a
> required check for the master branch in the branch protection settings back
> then? (see #543845)

Sorry about that. I've granted you temporary admin permission again so you can deal with this PR. Keep me posted once you're done.

Webmaster,

The ip-validation hook is still active on the "Branch protection rule" for the master branch. I guess that it's something that has not been checked during the removal of the webhook as described in bug 540694 comment 22. I'm willing to remove the protection rule on Krazo repo but I guess that we should check all repos for similar pattern, wdyt?
Comment 10 Christian Kaltepoth CLA 2019-03-12 06:05:42 EDT
Thanks a lot! I just updated the branch protection settings and removed the required old "ip-protection" check. The old check immediately disappeared from the pull request I mentioned above. So the problem should be fixed now.

Feel free to revoke the admin permissions again from my account.

Thanks a lot!
Comment 11 Mikaël Barbero CLA 2019-03-12 06:07:42 EDT
Ok, thanks. I've removed the admin perm. I would have liked to wait for webmasters to check how the branch protection was setup before removing it, but I guess they  will figure it out.
Comment 12 Christian Kaltepoth CLA 2019-03-12 06:23:38 EDT
Ah, ok. Sorry about that. Looks like I was too quick.