mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-18 07:54:28 +00:00
Code Issues Projects Releases Wiki Activity

ability to cancel a single job (not entire build)

Browse source
This commit is contained in:
Brad Rydzewski 2015-10-01 12:05:23 -07:00
parent 37e515fbca
commit 6bc28bd41c
5 changed files with 47 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
controller/build.go
View file

@ -93,7 +93,32 @@ func GetBuildLogs(c *gin.Context) {
}
func DeleteBuild(c *gin.Context) {
c.String(http.StatusOK, "DeleteBuild")
engine_ := context.Engine(c)
repo := session.Repo(c)
db := context.Database(c)
// parse the build number and job sequence number from
// the repquest parameter.
num, _ := strconv.Atoi(c.Params.ByName("number"))
seq, _ := strconv.Atoi(c.Params.ByName("job"))
build, err := model.GetBuildNumber(db, repo, num)
if err != nil {
c.AbortWithError(404, err)
return
}
job, err := model.GetJobNumber(db, build, seq)
if err != nil {
c.AbortWithError(404, err)
return
}
node, err := model.GetNode(db, job.NodeID)
if err != nil {
c.AbortWithError(404, err)
return
}
engine_.Cancel(build.ID, job.ID, node)
}
func PostBuild(c *gin.Context) {

2
engine/engine.go
View file

@ -80,7 +80,7 @@ func Load(db *sql.DB, remote remote.Remote) Engine {
// Cancel cancels the job running on the specified Node.
func (e *engine) Cancel(build, job int64, node *model.Node) error {
client, err := dockerclient.NewDockerClient(node.Addr, nil)
client, err := newDockerClient(node.Addr, node.Cert, node.Key, node.CA)
if err != nil {
return err
}

2
router/router.go
View file

@ -104,7 +104,7 @@ func Load(middleware ...gin.HandlerFunc) http.Handler {
repo.DELETE("", session.MustPush, controller.DeleteRepo)
repo.POST("/builds/:number", session.MustPush, controller.PostBuild)
// repo.DELETE("/builds/:number", MustPush(), controller.DeleteBuild)
repo.DELETE("/builds/:number/:job", session.MustPush, controller.DeleteBuild)
}
}

17
static/scripts/build.js
View file

@ -6,6 +6,8 @@ function JobViewModel(repo, build, job, status) {
self.stream = function() {
$( "#output" ).html("");
$("#restart").hide();
$("#cancel").show();
var buf = new Drone.Buffer();
buf.start(document.getElementById("output"));
@ -32,6 +34,7 @@ function JobViewModel(repo, build, job, status) {
if (status !== "running" && status !== "pending") {
Logs(repo, build, job);
$("#restart").show();
}
if (status === "running") {
@ -53,6 +56,19 @@ function JobViewModel(repo, build, job, status) {
});
})
$("#cancel").click(function() {
$("#cancel").hide();
$.ajax({
url: "/api/repos/"+repo+"/builds/"+build+"/"+job,
type: "DELETE",
success: function( data ) { },
error: function( data ) {
console.log(data);
}
});
})
Subscribe(repo, function(data){
if (!data.jobs) {
@ -81,6 +97,7 @@ function JobViewModel(repo, build, job, status) {
// the restart button and hide the tail button.
if (after !== "pending" && after !== "running") {
$("#restart").show();
$("#cancel").hide();
$("#tail").hide();
}
}.bind(this));

3
template/amber/build.amber
View file

@ -52,7 +52,8 @@ block content
div with exit code #{$job.ExitCode}
div.build-btn-group
button.btn.btn-info#restart restart
button.btn.btn-info.hidden#restart restart
button.btn.btn-info.hidden#cancel cancel
div.col-md-8
pre#output