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

Got most of it all working except starting a build

This commit is contained in:
Daniel Brooks 2014-05-29 23:26:13 -07:00
parent c2ace53339
commit 308bbe25c7
4 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -11,6 +11,7 @@ Current Supported GitLabCI Functions
* `/project/PROJECT_NAME/builds/COMMIT_SHA1/status.json`
* `/project/PROJECT_NAME/builds/status.png?ref=BRANCH_NAME`
* `/project/PROJECT_NAME/builds/status.png?sha1=COMMIT_SHA1`
* `/project/PROJECT_NAME/builds/COMMIT_SHA1` redirects to build page.
Planned GitLabCI Functions
@ -27,6 +28,10 @@ Help Needed
* `/PROJECT_NAME/` should really be /PROJECT_ID_NUMBER/ - Can not find a project id number on an AbstractProject to use here instead.
Known Issues
=====================
* GitLab CI Merge Status pages says pending when there is no build scheduled, or the status is unknown. This is because I coded a workaround until this bug gets resolved: https://github.com/gitlabhq/gitlabhq/issues/7047
Contributing
=====================

BIN
gitlab-jenkins-1.0-SNAPSHOT.hpi Normal file
View File

Binary file not shown.

1
gitlab-jenkins.iml
View File

@ -14,7 +14,6 @@
<excludeFolder url="file://$MODULE_DIR$/target/jenkins-for-test" />
<excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
<excludeFolder url="file://$MODULE_DIR$/target/work" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

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

@ -75,6 +75,7 @@ public class GitLabWebHook implements UnprotectedRootAction {
String lastPath = paths.get(paths.size()-1);
String firstPath = paths.get(0);
String token = req.getParameter("token");
@ -93,8 +94,8 @@ public class GitLabWebHook implements UnprotectedRootAction {
this.generateStatusJSON(commitSHA1, project, req, res);
} else if(lastPath.equals("build")) {
String force = req.getParameter("force");
//TODO: Parse the body and build. See: https://github.com/fcelda/gitlab2jenkins/blob/master/web.rb#L99
String data = req.getParameter("data");
this.generateBuild(data, project, req, res);
} else if(lastPath.equals("status.png")) {
String branch = req.getParameter("ref");
String commitSHA1 = req.getParameter("sha1");
@ -107,6 +108,19 @@ public class GitLabWebHook implements UnprotectedRootAction {
e.printStackTrace();
throw HttpResponses.error(500,"Could not generate an image.");
}
} else if(firstPath.equals("builds") && !lastPath.equals("status.json")) {
AbstractBuild build = this.getBuildBySHA1(project, lastPath);
if(build != null) {
try {
res.sendRedirect2(build.getUrl());
} catch (IOException e) {
try {
res.sendRedirect2(build.getBuildStatusUrl());
} catch (IOException e1) {
e1.printStackTrace();
}
}
}
}
throw HttpResponses.ok();
@ -121,9 +135,13 @@ public class GitLabWebHook implements UnprotectedRootAction {
AbstractBuild mainBuild = this.getBuildBySHA1(project, commitSHA1);
JSONObject object = new JSONObject();
object.put("sha", commitSHA1);
if(mainBuild == null) {
try {
this.writeJSON(rsp, null);
object.put("status", "pending");
this.writeJSON(rsp, object);
return;
} catch (IOException e) {
throw HttpResponses.error(500,"Could not generate response.");
@ -131,9 +149,7 @@ public class GitLabWebHook implements UnprotectedRootAction {
}
JSONObject object = new JSONObject();
object.put("id", mainBuild.getNumber());
object.put("sha", commitSHA1);
BallColor currentBallColor = mainBuild.getIconColor().noAnime();
@ -210,13 +226,39 @@ public class GitLabWebHook implements UnprotectedRootAction {
}
private void processPayload(String payload) {
JSONObject json = JSONObject.fromObject(payload);
LOGGER.log(Level.FINE, "payload: {0}", json.toString(4));
GitLabPushRequest req = GitLabPushRequest.create(json);
/**
* Take the GitLab Data and parse through it.
* {
# "before": "95790bf891e76fee5e1747ab589903a6a1f80f22",
# "after": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
# "ref": "refs/heads/master",
# "commits": [
# {
# "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
# "message": "Update Catalan translation to e38cb41.",
# "timestamp": "2011-12-12T14:27:31+02:00",
# "url": "http://localhost/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
# "author": {
# "name": "Jordi Mallach",
# "email": "jordi@softcatala.org",
# }
# }, .... more commits
# ]
# }
* @param data
*/
private void generateBuild(String data, AbstractProject project, StaplerRequest req, StaplerResponse rsp) {
JSONObject json = JSONObject.fromObject(data);
LOGGER.log(Level.FINE, "data: {0}", json.toString(4));
String repositoryUrl = req.getRepository().getUrl();
if(data == null) {
return;
}
GitLabPushRequest request = GitLabPushRequest.create(json);
String repositoryUrl = request.getRepository().getUrl();
if (repositoryUrl == null) {
LOGGER.log(Level.WARNING, "No repository url found.");
return;
@ -230,7 +272,7 @@ public class GitLabWebHook implements UnprotectedRootAction {
if (trigger == null) {
continue;
}
trigger.onPost(req);
trigger.onPost(request);
}
} finally {
SecurityContextHolder.getContext().setAuthentication(old);