From 8b0e9be7c5be6c70c53aeb25c8a1a258ac3d54da Mon Sep 17 00:00:00 2001 From: rinrinne Date: Thu, 11 Sep 2014 18:19:15 +0900 Subject: [PATCH] Add one-off executor to search list for cancel job By "Build Current Pathcset Only" feature, running and queued jobs with the same change are canceled. These are found in queue items and executors. But MatrixJob uses one-off executor. It is not included in executors. So it cannot be canceled. This patch adds one-off executors to executor's list. Fix for JENKINS-24295 Task-Url: https://issues.jenkins-ci.org/browse/JENKINS-24295 --- .../plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java index f1147d66a..e2a5bbf9c 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java @@ -1980,7 +1980,10 @@ private void cancelJob(ParametersAction parameters) { // Interrupt any currently running jobs. for (Computer c : Hudson.getInstance().getComputers()) { - for (Executor e : c.getExecutors()) { + List executors = new ArrayList(); + executors.addAll(c.getOneOffExecutors()); + executors.addAll(c.getExecutors()); + for (Executor e : executors) { if (e.getCurrentExecutable() instanceof Actionable) { Actionable a = (Actionable)e.getCurrentExecutable(); List params = a.getActions(ParametersAction.class);