Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-46076] Hoping that workflow-job-plugin #131 will fix a flake in PodTemplateStepExecutionTest.testBadLabel #496

Merged
merged 6 commits into from
Jun 27, 2019
Merged

[JENKINS-46076] Hoping that workflow-job-plugin #131 will fix a flake in PodTemplateStepExecutionTest.testBadLabel #496

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e034f1d
[JENKINS-46076] Hoping that workflow-job-plugin #131 will fix a flake…
jglick Jun 10, 2019
87a5899
Still cannot assume that waitForCompletion (→ isBuilding) produces a …
jglick Jun 10, 2019
34c6cf3
Merge branch 'master' into finish-JENKINS-46076
jglick Jun 11, 2019
7a6d33d
Merge branch 'master' into finish-JENKINS-46076
jglick Jun 12, 2019
83017cd
Bump.
jglick Jun 12, 2019
6cb6982
workflow-job 2.33
jglick Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>2.31</version>
<version>2.33-rc970.e82d4fa96516</version> <!-- TODO https://github.com/jenkinsci/workflow-job-plugin/pull/131 -->
jglick marked this conversation as resolved.
Show resolved Hide resolved
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ...t/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/PodTemplateStepExecutionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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);
}

}