Allow passing multiple job_ids

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/scripts/kill.py b/scripts/kill.py
index 032b4fdc0e913989f35766f6c02c7ddddb6ca782..f639bf23e3239c1a1b00355c68147f943157439a 100644 (file)
--- a/scripts/kill.py
+++ b/scripts/kill.py
@@ -5,7 +5,7 @@ import teuthology.kill
 
 doc = """
 usage: teuthology-kill [-h] [-a ARCHIVE] -r RUN
-       teuthology-kill [-h] [-a ARCHIVE] -r RUN -j JOB
+       teuthology-kill [-h] [-a ARCHIVE] -r RUN -j JOB ...
        teuthology-kill [-h] -o OWNER -m MACHINE_TYPE -r RUN
 
 Kill running teuthology jobs:

diff --git a/teuthology/kill.py b/teuthology/kill.py
index 430fcf1f71f095452a71ba6a3a58944e105d8f65..ec039ebf2b15f1faa3d75ee27e62d6538ecd1c59 100755 (executable)
--- a/teuthology/kill.py
+++ b/teuthology/kill.py
@@ -15,13 +15,14 @@ log = logging.getLogger(__name__)
 
 def main(args):
     run_name = args['--run']
-    job_id = args['--job']
+    job = args['--job']
     archive_base = args['--archive']
     owner = args['--owner']
     machine_type = args['--machine_type']
 
-    if job_id:
-        kill_job(run_name, job_id, archive_base, owner, machine_type)
+    if job:
+        for job_id in job:
+            kill_job(run_name, job_id, archive_base, owner, machine_type)
     else:
         kill_run(run_name, archive_base, owner, machine_type)