p85947160
/
Gitee-Jenkins-Plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #7 from DABSquared/selective_trigger 

Selective trigger
This commit is contained in:
bassrock 2014-08-05 10:04:38 -07:00
parent 57d873b931 137a7f094e
commit cdfc21d2db
2 changed files with 92 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java
View File

@ -42,14 +42,25 @@ import com.dabsquared.gitlabjenkins.GitLabPushRequest.Commit;
* @author Daniel Brooks * @author Daniel Brooks
*/ */
public class GitLabPushTrigger extends Trigger<AbstractProject<?, ?>> { public class GitLabPushTrigger extends Trigger<AbstractProject<?, ?>> {
private boolean triggerOnPush = true;
private boolean triggerOnMergeRequest = true;
@DataBoundConstructor @DataBoundConstructor
public GitLabPushTrigger() { public GitLabPushTrigger(boolean triggerOnPush, boolean triggerOnMergeRequest) {
this.triggerOnPush = triggerOnPush;
this.triggerOnMergeRequest = triggerOnMergeRequest;
}
public boolean getTriggerOnPush() {
return triggerOnPush;
}
public boolean getTriggerOnMergeRequest() {
return triggerOnMergeRequest;
} }
public void onPost(final GitLabPushRequest req) { public void onPost(final GitLabPushRequest req) {
if (triggerOnPush) {
getDescriptor().queue.execute(new Runnable() { getDescriptor().queue.execute(new Runnable() {
public void run() { public void run() {
@ -103,8 +114,10 @@ public class GitLabPushTrigger extends Trigger<AbstractProject<?, ?>> {
}); });
} }
}
public void onPost(final GitLabMergeRequest req) { public void onPost(final GitLabMergeRequest req) {
if (triggerOnMergeRequest) {
getDescriptor().queue.execute(new Runnable() { getDescriptor().queue.execute(new Runnable() {
public void run() { public void run() {
LOGGER.log(Level.INFO, "{0} triggered.", job.getName()); LOGGER.log(Level.INFO, "{0} triggered.", job.getName());
@ -148,6 +161,7 @@ public class GitLabPushTrigger extends Trigger<AbstractProject<?, ?>> {
}); });
} }
}
@Override @Override
public DescriptorImpl getDescriptor() { public DescriptorImpl getDescriptor() {

8
src/main/resources/com/dabsquared/gitlabjenkins/GitLabPushTrigger/config.jelly Normal file
View File

@ -0,0 +1,8 @@
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:entry title="Build on Push Events" field="triggerOnPush">
<f:checkbox default="true" />
</f:entry>
<f:entry title="Build on Merge Request Events" field="triggerOnMergeRequest">
<f:checkbox default="true" />
</f:entry>
</j:jelly>