Skip to content

Fix so 'Never rebuild merge requests' feature works #869

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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix so 'Never rebuild merge requests' feature works #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73700a5
rename Action closed to close
YaraslauSupanitski Dec 10, 2018
de6bfb0
fix logic for close and closed MR
YaraslauSupanitski Dec 10, 2018
1dd1b5c
fix logic for update action into MR and flag never
YaraslauSupanitski Dec 10, 2018
90d6c97
update tests
YaraslauSupanitski Dec 10, 2018
71c122e
Merge branch 'master' of https://github.com/jenkinsci/gitlab-plugin i…
YaraslauSupanitski Oct 18, 2019
6823fe2
Merge remote-tracking branch 'baseline/master' into fix/merge_request…
YaraslauSupanitski Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/dabsquared/gitlabjenkins/gitlab/hook/model/Action.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* @author Robin Müller
*/
public enum Action {
open, update, approved, merge, closed, reopen
open, update, approved, merge, close, reopen
}
5 changes: 3 additions & 2 deletions ...dabsquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ public static MergeRequestHookTriggerHandler newMergeRequestHookTriggerHandler(b

TriggerConfigChain chain = new TriggerConfigChain();
chain
.acceptOnlyIf(triggerOpenMergeRequest != TriggerOpenMergeRequest.never, of(State.opened, State.updated), of(Action.update))
.acceptOnlyIf(triggerOnApprovedMergeRequest, null, of(Action.approved))
.acceptIf(triggerOnMergeRequest, of(State.opened, State.reopened), null)
.acceptIf(triggerOnAcceptedMergeRequest, null, of(Action.merge))
.acceptIf(triggerOnClosedMergeRequest, null, of(Action.closed))
.acceptIf(triggerOpenMergeRequest != TriggerOpenMergeRequest.never, of(State.updated), null)
.acceptIf(triggerOnClosedMergeRequest, null, of(Action.close))
.acceptIf(triggerOnClosedMergeRequest, of(State.closed), null)
;

Set<String> labelsThatForcesBuildIfAddedSet = Stream.of(split(trimToEmpty(labelsThatForcesBuildIfAdded), ",")).collect(toSet());
Expand Down
45 changes: 38 additions & 7 deletions ...absquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

import java.io.IOException;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.concurrent.ExecutionException;

import static com.dabsquared.gitlabjenkins.gitlab.hook.model.builder.generated.CommitBuilder.commit;
Expand Down Expand Up @@ -80,13 +79,35 @@ public void mergeRequest_ciSkip() throws IOException, InterruptedException {
}

@Test
public void mergeRequest_build_when_opened() throws IOException, InterruptedException, GitAPIException, ExecutionException {
MergeRequestHookTriggerHandler mergeRequestHookTriggerHandler = withConfig().build();
public void mergeRequest_build_when_opened_with_source() throws IOException, InterruptedException, GitAPIException, ExecutionException {
MergeRequestHookTriggerHandler mergeRequestHookTriggerHandler = withConfig()
.setTriggerOpenMergeRequest(TriggerOpenMergeRequest.source)
.build();
OneShotEvent buildTriggered = doHandle(mergeRequestHookTriggerHandler, State.opened);

assertThat(buildTriggered.isSignaled(), is(true));
}

@Test
public void mergeRequest_build_when_opened_with_both() throws IOException, InterruptedException, GitAPIException, ExecutionException {
MergeRequestHookTriggerHandler mergeRequestHookTriggerHandler = withConfig()
.setTriggerOpenMergeRequest(TriggerOpenMergeRequest.source)
.build();
OneShotEvent buildTriggered = doHandle(mergeRequestHookTriggerHandler, State.opened);

assertThat(buildTriggered.isSignaled(), is(true));
}

@Test
public void mergeRequest_build_when_opened_with_never() throws IOException, InterruptedException, GitAPIException, ExecutionException {
MergeRequestHookTriggerHandler mergeRequestHookTriggerHandler = withConfig()
.setTriggerOpenMergeRequest(TriggerOpenMergeRequest.never)
.build();
OneShotEvent buildTriggered = doHandle(mergeRequestHookTriggerHandler, State.opened, Action.update);

assertThat(buildTriggered.isSignaled(), is(false));
}

@Test
public void mergeRequest_build_when_reopened() throws IOException, InterruptedException, GitAPIException, ExecutionException {
MergeRequestHookTriggerHandler mergeRequestHookTriggerHandler = withConfig()
Expand All @@ -100,6 +121,7 @@ public void mergeRequest_build_when_reopened() throws IOException, InterruptedEx
public void mergeRequest_build_when_opened_with_approved_action_enabled() throws IOException, InterruptedException, GitAPIException, ExecutionException {
MergeRequestHookTriggerHandler mergeRequestHookTriggerHandler = withConfig()
.setTriggerOnApprovedMergeRequest(true)
.setTriggerOpenMergeRequest(TriggerOpenMergeRequest.source)
.build();
OneShotEvent buildTriggered = doHandle(mergeRequestHookTriggerHandler, State.opened);

Expand Down Expand Up @@ -133,7 +155,17 @@ public void mergeRequest_build_when_closed() throws IOException, InterruptedExce
MergeRequestHookTriggerHandler mergeRequestHookTriggerHandler = withConfig()
.setTriggerOnClosedMergeRequest(true)
.build();
OneShotEvent buildTriggered = doHandle(mergeRequestHookTriggerHandler, State.closed, Action.closed);
OneShotEvent buildTriggered = doHandle(mergeRequestHookTriggerHandler, State.closed, Action.close);

assertThat(buildTriggered.isSignaled(), is(true));
}

@Test
public void mergeRequest_build_when_close() throws IOException, InterruptedException, GitAPIException, ExecutionException {
MergeRequestHookTriggerHandler mergeRequestHookTriggerHandler = withConfig()
.setTriggerOnClosedMergeRequest(true)
.build();
OneShotEvent buildTriggered = doHandle(mergeRequestHookTriggerHandler, Action.close);

assertThat(buildTriggered.isSignaled(), is(true));
}
Expand All @@ -144,7 +176,7 @@ public void mergeRequest_build_when_closed_with_actions_enabled() throws IOExcep
.setTriggerOnClosedMergeRequest(true)
.setTriggerOnApprovedMergeRequest(true)
.build();
OneShotEvent buildTriggered = doHandle(mergeRequestHookTriggerHandler, State.closed, Action.closed);
OneShotEvent buildTriggered = doHandle(mergeRequestHookTriggerHandler, State.closed, Action.close);

assertThat(buildTriggered.isSignaled(), is(true));
}
Expand Down Expand Up @@ -205,7 +237,6 @@ public void mergeRequest_do_not_build_when_closed() throws IOException, Interrup
@Test
public void mergeRequest_do_not_build_for_updated_state_and_approved_action_when_both_not_enabled() throws IOException, InterruptedException, GitAPIException {
MergeRequestHookTriggerHandler mergeRequestHookTriggerHandler = withConfig()
.setTriggerOpenMergeRequest(TriggerOpenMergeRequest.source)
.build();
OneShotEvent buildTriggered = doHandle(mergeRequestHookTriggerHandler, State.updated, Action.approved);

Expand Down Expand Up @@ -425,7 +456,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
private MergeRequestObjectAttributesBuilder defaultMergeRequestObjectAttributes() {
return mergeRequestObjectAttributes()
.withIid(1)
.withAction(Action.update)
.withAction(Action.open)
.withState(State.opened)
.withTitle("test")
.withTargetProjectId(1)
Expand Down