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

Replace ball color with result.

This commit is contained in:
christ66 2015-10-12 17:37:00 -07:00
parent d966f9d5ff
commit 7270f21203
1 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,7 @@
package com.dabsquared.gitlabjenkins; package com.dabsquared.gitlabjenkins;
import hudson.Extension; import hudson.Extension;
import hudson.model.BallColor; import hudson.model.*;
import hudson.model.Item;
import hudson.model.ItemGroup;
import hudson.model.Job;
import hudson.model.UnprotectedRootAction;
import hudson.model.ParametersAction;
import hudson.model.Run;
import hudson.model.StringParameterValue;
import hudson.plugins.git.Branch; import hudson.plugins.git.Branch;
import hudson.plugins.git.GitSCM; import hudson.plugins.git.GitSCM;
import hudson.plugins.git.util.Build; import hudson.plugins.git.util.Build;
@ -240,26 +233,14 @@ public class GitLabWebHook implements UnprotectedRootAction {
object.put("id", mainBuild.getNumber()); object.put("id", mainBuild.getNumber());
BallColor currentBallColor = mainBuild.getIconColor().noAnime(); Result res = mainBuild.getResult();
//TODO: add status of pending when we figure it out. //TODO: add status of pending when we figure it out.
if(mainBuild.isBuilding()) { if(mainBuild.isBuilding()) {
object.put("status", "running"); object.put("status", "running");
}else if(currentBallColor == BallColor.BLUE) { }else if(res == Result.SUCCESS) {
object.put("status", "success"); object.put("status", "success");
}else if(currentBallColor == BallColor.ABORTED) { }else {
object.put("status", "failed");
}else if(currentBallColor == BallColor.DISABLED) {
object.put("status", "failed");
}else if(currentBallColor == BallColor.GREY) {
object.put("status", "failed");
}else if(currentBallColor == BallColor.NOTBUILT) {
object.put("status", "failed");
}else if(currentBallColor == BallColor.RED) {
object.put("status", "failed");
}else if(currentBallColor == BallColor.YELLOW) {
object.put("status", "failed");
} else {
object.put("status", "failed"); object.put("status", "failed");
} }
@ -294,15 +275,14 @@ public class GitLabWebHook implements UnprotectedRootAction {
} }
String imageUrl = "images/unknown.png"; String imageUrl = "images/unknown.png";
if(null != mainBuild) { if(null != mainBuild) {
BallColor currentBallColor = mainBuild.getIconColor().noAnime(); Result res = mainBuild.getResult();
if(mainBuild.isBuilding()) {
if(mainBuild.isBuilding()) {
imageUrl = "images/running.png"; imageUrl = "images/running.png";
}else if(currentBallColor == BallColor.BLUE) { }else if(res == Result.SUCCESS) {
imageUrl = "images/success.png"; imageUrl = "images/success.png";
}else if(currentBallColor == BallColor.RED) { }else if(res == Result.FAILURE) {
imageUrl = "images/failed.png"; imageUrl = "images/failed.png";
}else if(currentBallColor == BallColor.YELLOW) { }else if(res == Result.UNSTABLE) {
imageUrl = "images/unstable.png"; imageUrl = "images/unstable.png";
}else { }else {
imageUrl = "images/unknown.png"; imageUrl = "images/unknown.png";