Skip to content

Commit 06190e8

Browse files
committed
1 parent 7fcc00b commit 06190e8

File tree

2 files changed

+2
-27
lines changed

2 files changed

+2
-27
lines changed

pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
7171
<jenkins.baseline>2.479</jenkins.baseline>
7272
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
73+
<!-- TODO https://github.com/jenkinsci/jenkins-test-harness/pull/921 -->
74+
<jenkins-test-harness.version>2398.vd015803ca_4d3</jenkins-test-harness.version>
7375
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
7476
<spotless.check.skip>false</spotless.check.skip>
7577
</properties>

src/test/java/com/cloudbees/jenkins/support/SupportTestUtils.java

-27
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
import java.io.ByteArrayOutputStream;
2121
import java.io.File;
2222
import java.io.IOException;
23-
import java.nio.file.DirectoryStream;
2423
import java.nio.file.Files;
25-
import java.nio.file.LinkOption;
26-
import java.nio.file.Path;
2724
import java.util.Map;
2825
import java.util.Objects;
2926
import java.util.Set;
@@ -347,30 +344,6 @@ public static void stopAgents() throws Exception {
347344
LOGGER.info("stopping " + agent);
348345
agent.toComputer().disconnect(null).get();
349346
}
350-
var dir = Jenkins.get().getRootDir().toPath().resolve("agent-work-dirs");
351-
for (int i = 0; i < 60; i++) {
352-
try {
353-
delete(dir);
354-
LOGGER.info("successfully deleted " + dir);
355-
return;
356-
} catch (IOException x) {
357-
LOGGER.log(Level.WARNING, "failed to delete " + dir + " on attempt #" + i, x);
358-
Thread.sleep(1000);
359-
}
360-
}
361-
LOGGER.warning("never managed to delete " + dir);
362-
}
363-
364-
private static void delete(Path p) throws IOException {
365-
LOGGER.info(() -> "deleting " + p);
366-
if (Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) {
367-
try (DirectoryStream<Path> children = Files.newDirectoryStream(p)) {
368-
for (Path child : children) {
369-
delete(child);
370-
}
371-
}
372-
}
373-
Files.deleteIfExists(p);
374347
}
375348

376349
private SupportTestUtils() {}

0 commit comments

Comments
 (0)