From e034f1de7f047f590259836ac864bf82f401e94e Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 10 Jun 2019 12:12:20 -0400
Subject: [PATCH 1/4] [JENKINS-46076] Hoping that workflow-job-plugin #131 will
 fix a flake in PodTemplateStepExecutionTest.testBadLabel.

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8e619ba2bf..a7fa3afa8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-step-api</artifactId>
-      <version>2.17</version>
+      <version>2.19</version>
     </dependency>
     <dependency> <!-- DeclarativeAgent -->
       <groupId>org.jenkinsci.plugins</groupId>
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-job</artifactId>
-      <version>2.31</version>
+      <version>2.33-rc969.225d87e67c2d</version> <!-- TODO https://github.com/jenkinsci/workflow-job-plugin/pull/131 -->
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -136,7 +136,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-support</artifactId>
-      <version>3.0</version>
+      <version>3.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 87a5899e502b278d15ba49d293b6afa5850fbd6a Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 10 Jun 2019 14:21:25 -0400
Subject: [PATCH 2/4] =?UTF-8?q?Still=20cannot=20assume=20that=20waitForCom?=
 =?UTF-8?q?pletion=20(=E2=86=92=20isBuilding)=20produces=20a=20complete=20?=
 =?UTF-8?q?log=20file;=20need=20to=20use=20waitForMessage=20(=E2=86=92=20i?=
 =?UTF-8?q?sLogUpdated).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kubernetes/pipeline/PodTemplateStepExecutionTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/PodTemplateStepExecutionTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/PodTemplateStepExecutionTest.java
index a4f64a8323..c477011021 100644
--- a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/PodTemplateStepExecutionTest.java
+++ b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/PodTemplateStepExecutionTest.java
@@ -62,7 +62,7 @@ public void testBadNameDetection() throws Exception {
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
         r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b));
-        r.assertLogContains(Messages.RFC1123_error("badcontainerName_!"), b);
+        r.waitForMessage(Messages.RFC1123_error("badcontainerName_!"), b);
     }
 
     @Test
@@ -72,7 +72,7 @@ public void testBadNameYamlDetection() throws Exception {
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
         r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b));
-        r.assertLogContains(Messages.RFC1123_error("badcontainername_!, badcontainername2_!"), b);
+        r.waitForMessage(Messages.RFC1123_error("badcontainername_!, badcontainername2_!"), b);
     }
 
     @Test
@@ -82,7 +82,7 @@ public void testBadLabel() throws Exception {
         WorkflowRun b = p.scheduleBuild2(0).waitForStart();
         assertNotNull(b);
         r.assertBuildStatus(Result.FAILURE, r.waitForCompletion(b));
-        r.assertLogContains(Messages.label_error("mypod!123"), b);
+        r.waitForMessage(Messages.label_error("mypod!123"), b);
     }
 
 }

From 83017cd873a3b2204f6d739fc837c1f8d653fb08 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 12 Jun 2019 12:12:30 -0400
Subject: [PATCH 3/4] Bump.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e5292ee041..59afa7902e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-job</artifactId>
-      <version>2.33-rc969.225d87e67c2d</version> <!-- TODO https://github.com/jenkinsci/workflow-job-plugin/pull/131 -->
+      <version>2.33-rc970.e82d4fa96516</version> <!-- TODO https://github.com/jenkinsci/workflow-job-plugin/pull/131 -->
       <scope>test</scope>
     </dependency>
     <dependency>

From 6cb698237b8d429915138f1a6857314809fa9a55 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Thu, 27 Jun 2019 14:05:43 -0400
Subject: [PATCH 4/4] workflow-job 2.33

Co-Authored-By: Devin Nusbaum <dwnusbaum@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 59afa7902e..399139d780 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-job</artifactId>
-      <version>2.33-rc970.e82d4fa96516</version> <!-- TODO https://github.com/jenkinsci/workflow-job-plugin/pull/131 -->
+      <version>2.33</version>
       <scope>test</scope>
     </dependency>
     <dependency>