From d9d8ff583e68761c38ffe99c4ebae18b8ddfa235 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 7 Dec 2021 07:59:03 -0500 Subject: [PATCH 1/3] Updated to 2.303.x and latest BOM --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fc0c7f1d9a..26995d905d 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 8 - 2.263.1 + 2.303.3 false true @@ -256,8 +256,8 @@ io.jenkins.tools.bom - bom-2.263.x - 984.vb5eaac999a7e + bom-2.303.x + 1036.v9f5a1aba8fab import pom From 180296505e9e86205044bda1dc560bd06ab25c85 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 7 Dec 2021 08:01:51 -0500 Subject: [PATCH 2/3] Adapt to https://github.com/jenkinsci/workflow-durable-task-step-plugin/pull/147 --- .../kubernetes/pipeline/KubernetesDeclarativeAgentTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgentTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgentTest.java index cbb3843c8c..d32ac34398 100644 --- a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgentTest.java +++ b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgentTest.java @@ -167,7 +167,7 @@ public void declarativeWithNestedExplicitInheritance() throws Exception { @Test public void declarativeWithNonexistentDockerImage() throws Exception { assertNotNull(createJobThenScheduleRun()); - r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b)); + r.assertBuildStatus(Result.ABORTED, r.waitForCompletion(b)); r.assertLogContains("ERROR: Unable to pull Docker image", b); } From 644f700eeb14e5dac5933264e7e90f442009ff99 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 7 Dec 2021 08:58:45 -0500 Subject: [PATCH 3/3] `KubernetesPipelineTest.invalidPodGetsCancelled` also affected by https://github.com/jenkinsci/workflow-durable-task-step-plugin/pull/147 --- .../plugins/kubernetes/pipeline/KubernetesPipelineTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java index d8db2a7187..ee7ec6ef27 100644 --- a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java +++ b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java @@ -682,9 +682,9 @@ public void dynamicPVC() throws Exception { @Test public void invalidPodGetsCancelled() throws Exception { - r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b)); + r.assertBuildStatus(Result.ABORTED, r.waitForCompletion(b)); r.assertLogContains("ERROR: Unable to create pod", b); - r.assertLogContains("ERROR: Queue task was cancelled", b); + r.assertLogContains("Queue task was cancelled", b); } @Issue("SECURITY-1646")