Merge pull request #57 from abayer/jenkins-44379

[FIXED JENKINS-44379] Don't retry for any FlowInterruptedException
jenkinsci · Jan 19, 2018 · fa21a7c · fa21a7c
2 parents ac2c854 + bc294db
commit fa21a7c
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -188,5 +188,11 @@
             <version>0.5.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>pipeline-input-step</artifactId>
+            <version>2.8</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/steps/RetryStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/steps/RetryStepExecution.java
@@ -57,12 +57,8 @@ public void onSuccess(StepContext context, Object result) {
         public void onFailure(StepContext context, Throwable t) {
             try {
                 if (t instanceof FlowInterruptedException) {
-                    for (CauseOfInterruption cause : ((FlowInterruptedException) t).getCauses()) {
-                        if (cause instanceof CauseOfInterruption.UserInterruption) {
-                            context.onFailure(t);
-                            return;
-                        }
-                    }
+                    context.onFailure(t);
+                    return;
                 }
                 left--;
                 if (left>0) {

diff --git a/src/test/java/org/jenkinsci/plugins/workflow/steps/RetryStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/steps/RetryStepTest.java
@@ -1,12 +1,16 @@
 package org.jenkinsci.plugins.workflow.steps;
 
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.model.Result;
 import hudson.model.User;
 import hudson.model.queue.QueueTaskFuture;
 import hudson.security.ACL;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
+import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
+import org.jenkinsci.plugins.workflow.support.steps.input.InputAction;
+import org.jenkinsci.plugins.workflow.support.steps.input.InputStepExecution;
 import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -101,4 +105,37 @@ public void abortShouldNotRetry() throws Exception {
 
     }
 
+    @Issue("JENKINS-44379")
+    @Test
+    public void inputAbortShouldNotRetry() throws Exception {
+        WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
+        p.setDefinition(new CpsFlowDefinition("int count = 0\n" +
+                "retry(3) {\n" +
+                "  echo 'trying '+(count++)\n" +
+                "  input id: 'InputX', message: 'OK?', ok: 'Yes'\n" +
+                "}\n", true));
+
+        QueueTaskFuture<WorkflowRun> queueTaskFuture = p.scheduleBuild2(0);
+        WorkflowRun run = queueTaskFuture.getStartCondition().get();
+        CpsFlowExecution execution = (CpsFlowExecution) run.getExecutionPromise().get();
+
+        while (run.getAction(InputAction.class) == null) {
+            execution.waitForSuspension();
+        }
+
+        InputAction inputAction = run.getAction(InputAction.class);
+        InputStepExecution is = inputAction.getExecution("InputX");
+        HtmlPage page = r.createWebClient().getPage(run, inputAction.getUrlName());
+
+        r.submit(page.getFormByName(is.getId()), "abort");
+        assertEquals(0, inputAction.getExecutions().size());
+        queueTaskFuture.get();
+
+        r.assertBuildStatus(Result.ABORTED, r.waitForCompletion(run));
+
+        r.assertLogContains("trying 0", run);
+        r.assertLogNotContains("trying 1", run);
+        r.assertLogNotContains("trying 2", run);
+    }
+
 }