Merge pull request #1480 from Vlatombe/test-robustness-fixes

Test robustness fixes

Author: Vlatombe

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

@@ -131,6 +131,17 @@ public void allDead() throws Exception {
         for (int i = 0; i < 100 && r.isSomethingHappening(); i++) {
             Thread.sleep(100);
         }
+        Jenkins.get().getNodes().stream()
+                .filter(KubernetesSlave.class::isInstance)
+                .map(KubernetesSlave.class::cast)
+                .forEach(agent -> {
+                    LOGGER.info(() -> "Deleting remaining node " + agent);
+                    try {
+                        agent.terminate();
+                    } catch (InterruptedException | IOException e) {
+                        LOGGER.log(Level.WARNING, "Failed to terminate " + agent, e);
+                    }
+                });
     }
 
     @Issue("JENKINS-57993")
@@ -692,17 +703,27 @@ public void secretMaskingWindows() throws Exception {
     @Test
     public void dynamicPVCWorkspaceVolume() throws Exception {
         assumePvcAccess();
-        var size = cloud.connect().persistentVolumeClaims().list().getItems().size();
+        var client = cloud.connect();
+        var podSize = client.pods().list().getItems().size();
+        var pvcSize = client.persistentVolumeClaims().list().getItems().size();
         r.assertBuildStatusSuccess(r.waitForCompletion(b));
-        await().until(() -> cloud.connect().persistentVolumeClaims().list().getItems(), hasSize(size));
+        await("The number of pods should be the same as before building")
+                .until(() -> client.pods().list().getItems(), hasSize(podSize));
+        await("The number of PVCs should be the same as before building")
+                .until(() -> client.persistentVolumeClaims().list().getItems(), hasSize(pvcSize));
     }
 
     @Test
     public void dynamicPVCVolume() throws Exception {
         assumePvcAccess();
-        var size = cloud.connect().persistentVolumeClaims().list().getItems().size();
-        r.assertBuildStatusSuccess(r.waitForCompletion(b));
-        await().until(() -> cloud.connect().persistentVolumeClaims().list().getItems(), hasSize(size));
+        var client = cloud.connect();
+        var podSize = client.pods().list().getItems().size();
+        var pvcSize = client.persistentVolumeClaims().list().getItems().size();
+        r.assertBuildStatusSuccess(r.waitForCompletion(b));
+        await("The number of pods should be the same as before building")
+                .until(() -> client.pods().list().getItems(), hasSize(podSize));
+        await("The number of PVCs should be the same as before building")
+                .until(() -> client.persistentVolumeClaims().list().getItems(), hasSize(pvcSize));
     }
 
     private void assumePvcAccess() throws KubernetesAuthException, IOException {