-
Notifications
You must be signed in to change notification settings - Fork 619
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Plugin modes for better MR handling. #252
Conversation
…acy mode, the plugin behaves as usual, configured with multiple git repositores and a parametrized build. In Modern mode, it fetches merge-requests from origin, so a simpler setup can be used (and indeed is recommended).
Thank you for this pull request! Please check this document for how the Jenkins project handles pull requests. |
This looks massively interesting to us, as we're impacted by one of the issues you refer to. A couple of questions, if that's OK (and this is the appropriate place for this):
Thanks. |
|
@pbendersky Excellent - thanks. Look forward to this making it towards the released plugin. |
@omehegan @coder-hugo not sure who are the maintainers of this project, but saw you have several commits. Is there anything I can do to help getting this merged? |
@pbendersky I hadn't yet the time for a deeper look to your changes. But your branch is based on the current master which will be replaced in a few days by the release-1.2 brach which contains a lot of code cleanups (almost everything was touched during the cleanup). Therefore I'd suggest you to have a look to the release-1.2 branch and adapt your changes accordingly. This will definitively help getting it merged. |
@coder-hugo I'll look into |
@coder-hugo I see that you've released 1.2. I'll work into updating this MR for it. |
Update to latest from jenkinsci
This PR enhances gitlab-plugin by adding two operation modes: Modern and Legacy.
Legacy is what we currently have, that works with older versions of GitLab.
Modern works with GitLab 8.1 or better, and provides an easier configuration of projects in Jenkins (a single Git repository is enough) and much better handling of Merge Requests (MR are fetched from
origin
and matched by SHA1 instead of comparing branch names).This PR fixes the two issues I reported: #239 and #155.
Also, a quick review of the current issues indicates that it should fix (assuming they can use the Modern mode):
This has been implemented with a strategy pattern. The points where the strategy is used are ad-hoc based on where the Legacy and Modern strategies differ (a few but important points).