Skip to content

Commit d185c50

Browse files
committed
services/kill.py: Owner can also be "scheduled_<username>@teuthology"
"scheduled_<username>@teuthology" is the default owner name if run is scheduled from teuthology CLI tool. This commit allows users of same github username to recognize it as their jobs. Also fix how run_owner is determined. In teuthology, runs ownership is deteremined by job's "owner" and not run's "user" value. Signed-off-by: Vallari Agrawal <val.agl002@gmail.com>
1 parent 756cad2 commit d185c50

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/teuthology_api/services/kill.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,16 @@ async def run(args, send_logs: bool, access_token: dict, request: Request):
2828
run_name = args.get("--run")
2929
if run_name:
3030
run_details = get_run_details(run_name)
31-
run_owner = run_details.get("user")
31+
jobs_details = run_details.get("jobs", [])
32+
if jobs_details:
33+
run_owner = jobs_details[0].get("owner")
3234
else:
3335
log.error("teuthology-kill is missing --run")
3436
raise HTTPException(status_code=400, detail="--run is a required argument")
3537

36-
if run_owner.lower() != username.lower():
38+
if (run_owner.lower() != username.lower()) or (
39+
run_owner.lower() != f"scheduled_{username.lower()}@teuthology"
40+
):
3741
isUserAdmin = await isAdmin(username, access_token)
3842
if not isUserAdmin:
3943
log.error(

0 commit comments

Comments
 (0)