Skip to content

Commit ef32dc0

Browse files
committed
Rename some Docker projects for consistency (#55150)
Apply the :distribution:archives naming convention to some of the Docker sub-projects, so that we have a more consistent naming scheme. Also, we've seen some examples of Docker packaging tests failing sporadically when they try to clean up the temp directory, citing a not-empty directory. Ensure that any running container is removed before cleaning up the temp dir, in an effort to avoid this problem.
1 parent c645f6b commit ef32dc0

File tree

5 files changed

+1
-6
lines changed

5 files changed

+1
-6
lines changed

qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.elasticsearch.packaging.util.ServerUtils;
2727
import org.elasticsearch.packaging.util.Shell.Result;
2828
import org.junit.After;
29-
import org.junit.AfterClass;
3029
import org.junit.Before;
3130
import org.junit.BeforeClass;
3231

@@ -85,11 +84,6 @@ public static void filterDistros() {
8584
assumeTrue("only Docker", distribution().isDocker());
8685
}
8786

88-
@AfterClass
89-
public static void teardownSuite() {
90-
removeContainer();
91-
}
92-
9387
@Before
9488
public void setupTest() throws IOException {
9589
installation = runContainer(distribution());
@@ -98,6 +92,7 @@ public void setupTest() throws IOException {
9892

9993
@After
10094
public void teardownTest() {
95+
removeContainer();
10196
rm(tempDir);
10297
}
10398

0 commit comments

Comments
 (0)