Merge pull request #1118 from mor120/terminate-on-create-container-error

Author: Vlatombe

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pod/retention/Reaper.java

@@ -240,6 +240,9 @@ public void onEvent(@NonNull Action action, @NonNull KubernetesSlave node, @NonN
                     LOGGER.info(() -> ns + "/" + name + " Container " + c.getName() + " was just terminated, so removing the corresponding Jenkins agent");
                     runListener.getLogger().printf("%s/%s Container %s was terminated (Exit Code: %d, Reason: %s)%n", ns, name, c.getName(), t.getExitCode(), t.getReason());
                 });
+                try (ACLContext _ = ACL.as(ACL.SYSTEM)) {
+                    PodUtils.cancelQueueItemFor(pod, "ContainerError");
+                }
                 logLastLinesThenTerminateNode(node, pod, runListener);
             }
         }

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgentTest.java

@@ -179,6 +179,13 @@ public void declarativeWithNonexistentDockerImage() throws Exception {
         r.assertLogContains("ERROR: Unable to pull Docker image", b);
     }
 
+    @Test
+    public void declarativeWithCreateContainerError() throws Exception {
+        assertNotNull(createJobThenScheduleRun());
+        r.assertBuildStatus(Result.ABORTED, r.waitForCompletion(b));
+        r.assertLogContains("was terminated", b);
+    }
+
     @Issue("JENKINS-61360")
     @Test
     public void declarativeShowRawYamlFalse() throws Exception {

src/test/resources/org/csanchez/jenkins/plugins/kubernetes/pipeline/declarativeWithCreateContainerError.groovy

@@ -0,0 +1,30 @@
+pipeline {
+  agent {
+    kubernetes {
+      yaml '''
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    some-label: some-label-value
+spec:
+  containers:
+  - name: busybox
+    image: busybox
+    tty: true
+    command: ['sh', '-c', "thiscommandshouldcreateanerror;"]
+'''
+     }
+  }
+  stages {
+    stage('Run') {
+      steps {
+        container('busybox') {
+          sh """
+        will never run
+          """
+        }
+      }
+    }
+  }
+}