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

allowed branches filter only for Push events 

Refactor status.png functionality to support Jenkins instances using
authentication
This commit is contained in:
Dimitris Stafylarakis 2014-09-03 15:58:42 +02:00
parent 48d67cdf99
commit a92c1bf251
3 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,7 @@ public class GitLabPushTrigger extends Trigger<AbstractProject<?, ?>> {
}
public void onPost(final GitLabMergeRequest req) {
if (triggerOnMergeRequest && (allowedBranches.contains("*") || allowedBranches.contains(getSourceBranch(req)))) {
if (triggerOnMergeRequest) {
getDescriptor().queue.execute(new Runnable() {
public void run() {
LOGGER.log(Level.INFO, "{0} triggered.", job.getName());
@ -319,6 +319,9 @@ public class GitLabPushTrigger extends Trigger<AbstractProject<?, ?>> {
protected URIish getSourceRepoURLDefault() {
URIish url = null;
SCM scm = project.getScm();
if(!(scm instanceof GitSCM)) {
throw new IllegalArgumentException("This repo does not use git.");
}
if (scm instanceof GitSCM) {
List<RemoteConfig> repositories = ((GitSCM) scm).getRepositories();
if (!repositories.isEmpty()){

51
src/main/java/com/dabsquared/gitlabjenkins/GitLabWebHook.java
View File

@ -7,6 +7,7 @@ import hudson.model.ItemGroup;
import hudson.model.UnprotectedRootAction;
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.BuildAuthorizationToken;
import hudson.plugins.git.GitSCM;
import hudson.plugins.git.util.BuildData;
import hudson.scm.SCM;
@ -16,7 +17,9 @@ import hudson.util.HttpResponses;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
@ -203,7 +206,7 @@ public class GitLabWebHook implements UnprotectedRootAction {
}
private void generateStatusPNG(String branch, String commitSHA1, AbstractProject project, StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException {
private void generateStatusPNG(String branch, String commitSHA1, AbstractProject project, final StaplerRequest req, final StaplerResponse rsp) throws ServletException, IOException {
SCM scm = project.getScm();
if(!(scm instanceof GitSCM)) {
throw new IllegalArgumentException("This repo does not use git.");
@ -222,33 +225,33 @@ public class GitLabWebHook implements UnprotectedRootAction {
if (baseUrl.endsWith("/")) {
baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
}
String imageUrl = "/plugin/gitlab-plugin/images/unknown.png";
if(null != mainBuild) {
BallColor currentBallColor = mainBuild.getIconColor().noAnime();
if(mainBuild == null) {
rsp.sendRedirect2(baseUrl + "/plugin/gitlab-plugin/images/unknown.png");
return;
if(mainBuild.isBuilding()) {
imageUrl = "/plugin/gitlab-plugin/images/running.png";
}else if(currentBallColor == BallColor.BLUE) {
imageUrl = "/plugin/gitlab-plugin/images/success.png";
}else if(currentBallColor == BallColor.RED) {
imageUrl = "/plugin/gitlab-plugin/images/failed.png";
}else {
imageUrl = "/plugin/gitlab-plugin/images/unknown.png";
}
}
BallColor currentBallColor = mainBuild.getIconColor().noAnime();
final URL url = new URL(baseUrl + imageUrl);
ACL.impersonate(ACL.SYSTEM, new Runnable() {
if(mainBuild.isBuilding()) {
rsp.sendRedirect2(baseUrl + "/plugin/gitlab-plugin/images/running.png");
}else if(currentBallColor == BallColor.BLUE) {
rsp.sendRedirect2(baseUrl + "/plugin/gitlab-plugin/images/success.png");
}else if(currentBallColor == BallColor.ABORTED) {
rsp.sendRedirect2(baseUrl + "/plugin/gitlab-plugin/images/unknown.png");
}else if(currentBallColor == BallColor.DISABLED) {
rsp.sendRedirect2(baseUrl + "/plugin/gitlab-plugin/images/unknown.png");
}else if(currentBallColor == BallColor.GREY) {
rsp.sendRedirect2(baseUrl + "/plugin/gitlab-plugin/images/unknown.png");
}else if(currentBallColor == BallColor.NOTBUILT) {
rsp.sendRedirect2(baseUrl + "/plugin/gitlab-plugin/images/unknown.png");
}else if(currentBallColor == BallColor.RED) {
rsp.sendRedirect2(baseUrl + "/plugin/gitlab-plugin/images/failed.png");
}else if(currentBallColor == BallColor.YELLOW) {
rsp.sendRedirect2(baseUrl + "/plugin/gitlab-plugin/images/unknown.png");
} else {
rsp.sendRedirect2(baseUrl + "/plugin/gitlab-plugin/images/unknown.png");
}
public void run() {
try {
rsp.sendRedirect2(url.toString());
} catch (IOException e) {
throw HttpResponses.error(500,"Could not generate response.");
}
}
});
}

2
src/main/webapp/help/help-allowedBranches.html
View File

@ -1,3 +1,3 @@
<div>
Source branches allowed to trigger a build (either as Push or Merge Request). Multiple selections possible with Ctrl-click.
Source branches allowed to trigger a build from a <b>Push event</b>. Multiple selections possible with Ctrl-click.
</div>