Merge pull request DIRACGrid#7797 from DIRACGridBot/cherry-pick-2-192…

…02d80c-integration

[sweep:integration] Allow jobs to be killed in more states

src/DIRAC/WorkloadManagementSystem/Client/JobStatus.py

@@ -64,7 +64,7 @@
 ]
 
 # Job States when the payload work has finished
-JOB_FINAL_STATES = [DONE, COMPLETED, FAILED]
+JOB_FINAL_STATES = [DONE, COMPLETED, FAILED, KILLED]
 
 # WMS internal job States indicating the job object won't be updated
 JOB_REALLY_FINAL_STATES = [DELETED]
@@ -89,14 +89,14 @@ def __init__(self, state):
             COMPLETING: State(10, [DONE, FAILED, COMPLETED, STALLED, KILLED], defState=COMPLETING),
             STALLED: State(9, [RUNNING, FAILED, KILLED], defState=STALLED),
             RUNNING: State(8, [STALLED, DONE, FAILED, RESCHEDULED, COMPLETING, KILLED, RECEIVED], defState=RUNNING),
-            RESCHEDULED: State(7, [WAITING, RECEIVED, DELETED, FAILED], defState=RESCHEDULED),
+            RESCHEDULED: State(7, [WAITING, RECEIVED, DELETED, FAILED, KILLED], defState=RESCHEDULED),
             MATCHED: State(6, [RUNNING, FAILED, RESCHEDULED, KILLED], defState=MATCHED),
             WAITING: State(5, [MATCHED, RESCHEDULED, DELETED, KILLED], defState=WAITING),
             STAGING: State(4, [CHECKING, WAITING, FAILED, KILLED], defState=STAGING),
             SCOUTING: State(3, [CHECKING, FAILED, STALLED, KILLED], defState=SCOUTING),
-            CHECKING: State(2, [SCOUTING, STAGING, WAITING, RESCHEDULED, FAILED, DELETED], defState=CHECKING),
-            RECEIVED: State(1, [SCOUTING, CHECKING, WAITING, FAILED, DELETED], defState=RECEIVED),
-            SUBMITTING: State(0, [RECEIVED, CHECKING, DELETED], defState=SUBMITTING),  # initial state
+            CHECKING: State(2, [SCOUTING, STAGING, WAITING, RESCHEDULED, FAILED, DELETED, KILLED], defState=CHECKING),
+            RECEIVED: State(1, [SCOUTING, CHECKING, WAITING, FAILED, DELETED, KILLED], defState=RECEIVED),
+            SUBMITTING: State(0, [RECEIVED, CHECKING, DELETED, KILLED], defState=SUBMITTING),  # initial state
         }