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.

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-49707] If a KubernetesComputer disconnects, remove the KubernetesSlave #461

Merged
merged 23 commits into from
Jul 10, 2019
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
99ad1f2
[JENKINS-49707] If a KubernetesComputer disconnects, remove the Kuber…
jglick Apr 30, 2019
cae2572
workflow-step-api-plugin.version
jglick Apr 30, 2019
eed014f
Updated to https://github.com/jenkinsci/workflow-durable-task-step-pl…
jglick Apr 30, 2019
c3c98a1
Incremental deployment.
jglick Apr 30, 2019
4510310
JDK 11 Javadoc failure.
jglick Apr 30, 2019
8569e83
Setting surefire.rerunFailingTestsCount to 0 not 1.
jglick May 1, 2019
f11a182
Copy-pasta.
jglick May 1, 2019
ce032c6
Redesigned fix to remove agents when a pod is deleted, rather than me…
jglick May 1, 2019
61307bf
We will not in general be permitted to watch pods at cluster scope, s…
jglick May 1, 2019
6da8cf6
Merge branch 'master' into removingAgentIsFatal-JENKINS-49707
jglick Jun 5, 2019
2c3b39e
Bump.
jglick Jun 5, 2019
5b30251
RequireUpperBoundDeps
jglick Jun 5, 2019
3f00eb1
Need to update workflow-cps to interpret DynamicContext.
jglick Jun 5, 2019
6f60c9e
Merge branch 'master' into removingAgentIsFatal-JENKINS-49707
jglick Jun 11, 2019
b9b5f9c
Merge branch 'master' into removingAgentIsFatal-JENKINS-49707
jglick Jun 11, 2019
210e0f7
Test flake pending #496.
jglick Jun 11, 2019
a25d24f
Bump.
jglick Jun 11, 2019
e71a5c5
Senseless to even try to build against _older_ LTS lines than our min…
jglick Jun 11, 2019
3c49b62
Merge branch 'master' into removingAgentIsFatal-JENKINS-49707
jglick Jun 13, 2019
a5269d3
Merge branch 'master' into removingAgentIsFatal-JENKINS-49707
jglick Jul 2, 2019
70153a9
workflow-durable-task-step 2.32
jglick Jul 5, 2019
a4cccb7
Merge branch 'master' into removingAgentIsFatal-JENKINS-49707
jglick Jul 5, 2019
bb4e297
Using improved assertion after #496.
jglick Jul 5, 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
Prev Previous commit
Using improved assertion after #496.
jglick committed Jul 5, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit bb4e2978fe5ffffd5fdfa8dc0f70e23bf9fae4cc
Original file line number Diff line number Diff line change
@@ -353,10 +353,7 @@ public void terminatedPod() throws Exception {
r.waitForMessage("+ sleep", b);
deletePods(cloud.connect(), getLabels(this, name), false);
r.assertBuildStatus(Result.ABORTED, r.waitForCompletion(b));
// TODO could use waitForMessage after #496
while (!JenkinsRule.getLog(b).contains(new ExecutorStepExecution.RemovedNodeCause().getShortDescription())) {
Thread.sleep(100);
}
r.waitForMessage(new ExecutorStepExecution.RemovedNodeCause().getShortDescription(), b);
}

@Test
Original file line number Diff line number Diff line change
@@ -212,10 +212,7 @@ public void terminatedPodAfterRestart() throws Exception {
// Indeed we get two Reaper instances running, which independently remove the node.
deletePods(cloud.connect(), getLabels(this, name), false);
r.assertBuildStatus(Result.ABORTED, r.waitForCompletion(b));
while (!JenkinsRule.getLog(b).contains(new ExecutorStepExecution.RemovedNodeCause().getShortDescription())) {
// TODO JenkinsRule.waitForMessage has a race condition w.r.t. the termination cause printed by WorkflowRun.finish
Thread.sleep(100);
}
r.waitForMessage(new ExecutorStepExecution.RemovedNodeCause().getShortDescription(), b);
// Currently the logic in ExecutorStepExecution cannot handle a Jenkins restart so it prints the following.
// It does not matter since DurableTaskStep redundantly implements the same check.
r.assertLogContains(" was deleted, but do not have a node body to cancel", b);