Skip to content

Commit cb8f30b

Browse files
committed
remove active runner deletion blocker
* translation text would be defect due to this change
1 parent ee066b6 commit cb8f30b

File tree

4 files changed

+0
-46
lines changed

4 files changed

+0
-46
lines changed

options/locale/locale_en-US.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3761,7 +3761,6 @@ runners.update_runner_failed = Failed to update runner
37613761
runners.delete_runner = Delete this runner
37623762
runners.delete_runner_success = Runner deleted successfully
37633763
runners.delete_runner_failed = Failed to delete runner
3764-
runners.delete_runner_failed_runner_active = Failed to delete active runner
37653764
runners.delete_runner_header = Confirm to delete this runner
37663765
runners.delete_runner_notice = If a task is running on this runner, it will be terminated and mark as failed. It may break building workflow.
37673766
runners.none = No runners available

routers/api/v1/shared/runners.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import (
1414
"code.gitea.io/gitea/routers/api/v1/utils"
1515
"code.gitea.io/gitea/services/context"
1616
"code.gitea.io/gitea/services/convert"
17-
18-
"xorm.io/builder"
1917
)
2018

2119
// RegistrationToken is response related to registration token
@@ -82,15 +80,6 @@ func DeleteRunner(ctx *context.APIContext, ownerID, repoID, runnerID int64) {
8280
ctx.APIErrorNotFound("No permission to delete this runner")
8381
return
8482
}
85-
exist, err := db.Exist[actions_model.ActionTask](ctx, builder.Eq{"`runner_id`": runner.ID}.And(builder.In("`status`", actions_model.StatusWaiting, actions_model.StatusRunning, actions_model.StatusBlocked)))
86-
if err != nil {
87-
ctx.APIErrorInternal(err)
88-
return
89-
}
90-
if exist {
91-
ctx.APIError(http.StatusConflict, "Runner is active")
92-
return
93-
}
9483

9584
err = actions_model.DeleteRunner(ctx, runner.ID)
9685
if err != nil {

routers/web/shared/actions/runners.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import (
1818
shared_user "code.gitea.io/gitea/routers/web/shared/user"
1919
"code.gitea.io/gitea/services/context"
2020
"code.gitea.io/gitea/services/forms"
21-
22-
"xorm.io/builder"
2321
)
2422

2523
const (
@@ -317,22 +315,6 @@ func RunnerDeletePost(ctx *context.Context) {
317315
successRedirectTo := rCtx.RedirectLink
318316
failedRedirectTo := rCtx.RedirectLink + url.PathEscape(ctx.PathParam("runnerid"))
319317

320-
exist, err := db.Exist[actions_model.ActionTask](ctx, builder.Eq{"`runner_id`": runner.ID}.And(builder.In("`status`", actions_model.StatusWaiting, actions_model.StatusRunning, actions_model.StatusBlocked)))
321-
if err != nil {
322-
log.Warn("DeleteRunnerPost.Exist failed: %v, url: %s", err, ctx.Req.URL)
323-
ctx.Flash.Warning(ctx.Tr("actions.runners.delete_runner_failed"))
324-
325-
ctx.JSONRedirect(failedRedirectTo)
326-
return
327-
}
328-
if exist {
329-
log.Warn("DeleteRunnerPost.Exist failed: cannot delete active runner")
330-
ctx.Flash.Warning(ctx.Tr("actions.runners.delete_runner_failed_runner_active"))
331-
332-
ctx.JSONRedirect(failedRedirectTo)
333-
return
334-
}
335-
336318
if err := actions_model.DeleteRunner(ctx, runner.ID); err != nil {
337319
log.Warn("DeleteRunnerPost.UpdateRunner failed: %v, url: %s", err, ctx.Req.URL)
338320
ctx.Flash.Warning(ctx.Tr("actions.runners.delete_runner_failed"))

tests/integration/api_org_runner_test.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -123,22 +123,6 @@ func TestAPIRunnerDeleteAdminRunnerNotFoundOrgApi(t *testing.T) {
123123
MakeRequest(t, req, http.StatusNotFound)
124124
}
125125

126-
func TestAPIRunnerDeleteConflictWhileJobIsRunningOrgApi(t *testing.T) {
127-
defer tests.PrepareTestEnv(t)()
128-
userUsername := "user2"
129-
token := getUserToken(t, userUsername, auth_model.AccessTokenScopeWriteOrganization)
130-
131-
_, err := db.GetEngine(t.Context()).Insert(&actions_model.ActionTask{
132-
RunnerID: 34347,
133-
Status: actions_model.StatusRunning,
134-
})
135-
assert.NoError(t, err)
136-
137-
// Verify delete the runner by id is blocked by active job
138-
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/orgs/org3/actions/runners/%d", 34347)).AddTokenAuth(token)
139-
MakeRequest(t, req, http.StatusConflict)
140-
}
141-
142126
func TestAPIRunnerDeleteNoConflictWhileJobIsDoneOrgApi(t *testing.T) {
143127
defer tests.PrepareTestEnv(t)()
144128
userUsername := "user2"

0 commit comments

Comments
 (0)