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

fallback to after sha on null checkout sha 

[FIXED gitlab-plugin-126]
This commit is contained in:
Markus Ebenhoeh 2015-11-15 12:23:32 +11:00
parent 113a759607
commit b4899a1f75
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,15 +262,9 @@ public class GitLabPushTrigger extends Trigger<Job<?, ?>> {
actions.add(parametersAction);
RevisionParameterAction revision;
if (req.getLastCommit() !=null) {
revision = new RevisionParameterAction(req.getLastCommit().getId());
} else {
if (req.getCheckout_sha().contains("0000000000000000000000000000000000000000") ){
// no commit and no checkout sha, a Tag was deleted, so no build need to be triggered
LOGGER.log(Level.INFO, "GitLab Push {0} has been deleted, skip build .", req.getRef());
return null;
}
revision = new RevisionParameterAction(req.getCheckout_sha());
revision = createPushRequestRevisionParameter(job, req);
if (revision==null) {
return null;
}
actions.add(revision);
@ -278,10 +272,38 @@ public class GitLabPushTrigger extends Trigger<Job<?, ?>> {
return actionsArray;
}
});
}
}
public RevisionParameterAction createPushRequestRevisionParameter(Job<?, ?> job, GitLabPushRequest req) {
RevisionParameterAction revision = null;
if (req.getLastCommit() !=null) {
revision = new RevisionParameterAction(req.getLastCommit().getId());
} else {
if (req.getCheckout_sha() != null) {
if (req.getCheckout_sha().contains("0000000000000000000000000000000000000000")) {
// no commit and no checkout sha, a Tag was deleted, so no build need to be triggered
LOGGER.log(Level.INFO, "GitLab Push {0} has been deleted, skip build .", req.getRef());
return null;
}
revision = new RevisionParameterAction(req.getCheckout_sha());
} else if (req.getBefore() != null
&& req.getBefore().contains("0000000000000000000000000000000000000000")) {
// new branches
revision = new RevisionParameterAction(req.getAfter());
} else {
LOGGER.log(Level.WARNING,
"unknown handled situation, dont know what revision to build for req {0} for job {1}",
new Object[] {req, (job!=null?job.getFullName():null)});
return null;
}
}
return revision;
}
// executes when the Trigger receives a merge request
public void onPost(final GitLabMergeRequest req) {
if (triggerOnMergeRequest) {