Commit Graph

1087 Commits

Author SHA1 Message Date
Tommi Salonen ea5c89dee0 Improved help text 2018-04-15 21:47:06 +03:00
Tommi Salonen 3c17f91f57 Added target url for cancelled builds 2018-04-15 21:47:06 +03:00
Tommi Salonen 3cec22aefb Moved cancelling pending builds to be done before setting build status pending.
The other order caused problems when the pending build had the same
commit as the new one: the build for the commit was shown as cancelled in Gitlab
even though it was pending in Jenkins.
2018-04-15 21:47:06 +03:00
Tommi Salonen 70773f3f83 Added tests for sending 'pending' builds status to GitLab and cancelling pending merge request builds on merge request update.
Also:
- Moved the code from PendingBuildsUtil to PendingBuildsHandler.
- Removed cancelling pending builds from OpenMergeRequestPushHookTriggerHandler. It is not needed there
because builds with same commitid are squashed anyway.
2018-04-15 21:47:06 +03:00
Tommi Salonen 4ecec17236 Removed the build number from target url when the state is pending
(job is waiting for the next available executor).

Build number in the url causes problems when there are more than one job
in the build queue. In those cases job.getNextBuildNumber returns the same
number for every build in the queue which leads to wrong urls reported to Gitlab.

The build number is assigned when the execution starts so the best option
for pending builds is probably just to set the target url point to the job page without
the build number.
2018-04-15 21:47:06 +03:00
Tommi Salonen df7432a760 Make it possible to cancel pending builds on merge request update. 2018-04-15 21:46:54 +03:00
Tommi Salonen 77fbc95c34 Make it possible to send pending build status to gitlab when a pipeline job is triggered 2018-04-15 20:57:00 +03:00
Owen Mehegan f36a970149
Merge pull request #743 from scottashipp/fix-minor-errors-in-readme
Fix minor grammar errors and punctuation uniformity in README
2018-04-09 16:58:52 +10:00
scottashipp 476bbed513 Fix minor grammar errors and punctuation uniformity in README 2018-04-06 15:40:31 -07:00
Owen Mehegan 23ad58bca3 Changelog: fix PR reference 2018-04-04 17:16:46 +10:00
Owen Mehegan f1a822fd4f [maven-release-plugin] prepare for next development iteration 2018-04-04 17:11:26 +10:00
Owen Mehegan 99b09903c1 [maven-release-plugin] prepare release gitlab-plugin-1.5.5 2018-04-04 17:06:49 +10:00
Owen Mehegan d015e9b01e Changelog for 1.5.5 2018-04-04 17:02:25 +10:00
Owen Mehegan a08fc040dd README: Add section about configuring with Job DSL. Fixes #722. 2018-04-04 16:45:48 +10:00
Owen Mehegan f95e65964b
Merge pull request #698 from Argelbargel/fix-697
Make plugin respect no-proxy-hosts when a proxy is used
2018-04-04 16:32:51 +10:00
Owen Mehegan 6acfad1c4a
Merge pull request #732 from benjarobin/fix-mr-filter-by-label
Fix filtering by label never matches anything. Fixes #647.
2018-04-04 16:25:50 +10:00
Owen Mehegan 9d8f7cc0f2 Clarify documentation of the webhook URL 2018-03-29 17:52:55 +11:00
Owen Mehegan acaab4d405
README: example of trigger configuration for multibranch jobs
Replaces #684.
2018-03-26 11:19:46 +11:00
Owen Mehegan 84e808632c
Merge pull request #731 from mreichel/Bug723
#723 "Build on successful pipeline events" setting will not stay set
2018-03-26 10:33:01 +11:00
Benjamin Robin a8ce097f27 Fix filtering by label never matches anything #647 2018-03-25 13:31:42 +02:00
Milena Zachow 333024a463 #723 Build on successful pipeline events 2018-03-23 17:39:08 +01:00
Owen Mehegan e022274e90 [maven-release-plugin] prepare for next development iteration 2018-03-23 16:52:34 +11:00
Owen Mehegan d39d051e68 [maven-release-plugin] prepare release gitlab-plugin-1.5.4 2018-03-23 16:52:01 +11:00
Owen Mehegan a59e565ba3 Changelog entries for 1.5.4. 2018-03-23 16:48:42 +11:00
Owen Mehegan 5aa460e1a8 README: add comment about new issue on GitLab side. Fixes #730. 2018-03-23 15:53:58 +11:00
Owen Mehegan 39b87da013 Change example URL in help text to be clearer. Fixes #728. 2018-03-22 16:42:15 +11:00
Owen Mehegan 06116f9ead
README: clarify doc about variables the plugin sets
Fixes #688
2018-03-21 17:56:26 +11:00
Owen Mehegan 1dd17f07c8
README: clarifies sending commit status in declarative pipeline jobs
Fixes #555
2018-03-21 17:30:50 +11:00
Owen Mehegan 30ea216cda
README: add a caution about sending build status in Pipeline jobs
Fixes #522.
2018-03-21 17:14:03 +11:00
Owen Mehegan 86c24a9518
README: fix doc for using forked repos (I think)
Fixes #428
2018-03-21 16:56:30 +11:00
Owen Mehegan 367e18f21f
Merge pull request #726 from pdudits/issue-663
Do not build approved merge requests unless specified so
2018-03-21 16:21:42 +11:00
Owen Mehegan ebc15db4d9
README: fix table of contents 2018-03-20 17:39:17 +11:00
Owen Mehegan 785fe61b61
README: reorganize a lot of the documentation 2018-03-20 17:20:10 +11:00
Patrik Dudits 554bb618a5 Do not build accepted merge requests unless specified so in the configuration.
The combination of state and action upon approval is "updated" and "approved". Therefore
such combination cannot be excluded by using logical or.

Therefore the meaning of the arguments to MergeRequestHookTriggerHandlerImpl changed,
and tests were adjusted properly.
2018-03-19 16:10:54 +01:00
Owen Mehegan 087796e0af
README: some cleanup of job configuration doc 2018-03-19 17:48:14 +11:00
Owen Mehegan 926ea00b81
Add request for maintainers to README 2018-03-19 17:19:15 +11:00
Owen Mehegan e11ef82b43 Remove references to the fact that commit status support was introduced (2.5 years ago) in GitLab 8.1 2018-03-19 17:02:00 +11:00
Owen Mehegan a45f2f4ed2
Merge pull request #724 from Kindrat/master
removed ignored IDE config
2018-03-19 15:49:31 +11:00
Owen Mehegan a2b8394ec0
Merge pull request #714 from jakub-bochenski/patch-4
Add getter to triggerOnApprovedMergeRequest
2018-03-19 15:21:43 +11:00
Oleksii Ignachuk b6ff5dc78d removed ignored IDE config 2018-03-12 20:12:08 +02:00
jakub-bochenski 134ba489c1
Add getter to triggerOnApprovedMergeRequest
Fixes #711
2018-02-14 18:19:18 +01:00
Owen Mehegan 80c3786af2
Merge pull request #710 from acdcjunior/patch-1
Readme: remove < from <your-gitlab-connection-name and other formatting
2018-02-06 11:28:30 +11:00
Antônio "acdc" Jr 896861595e
Readme: remove < from <your-gitlab-connection-name and other formatting 2018-02-05 15:48:32 -02:00
Owen Mehegan 13fc0ff3a9 [maven-release-plugin] prepare for next development iteration 2018-02-05 11:39:14 +11:00
Owen Mehegan 79ca08365d [maven-release-plugin] prepare release gitlab-plugin-1.5.3 2018-02-05 11:39:00 +11:00
Owen Mehegan a20c50399c Update changelog for 1.5.3 2018-02-05 11:05:08 +11:00
Owen Mehegan 6ac67a162b
Merge pull request #622 from sbrassely/fix-workflow-steps
[BIS] Fix issue #506 : GitlabCommitStatus throws error after force kill
2018-02-05 10:56:37 +11:00
sbrassely 5e95ffce1d Fix invalid import after resolving conflicts 2018-02-02 17:10:55 +01:00
Brassely Stéphane 0f77523137
Merge branch 'master' into fix-workflow-steps 2018-02-02 17:41:43 +02:00
Owen Mehegan 438e6ccae6
README: add a note explaining gitlab API vs git clone credentials 2018-01-23 18:04:10 +11:00