mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-23 05:15:04 +00:00
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.
This commit is contained in:
parent
1754e50cbd
commit
18dc2f7330
@ -26,7 +26,6 @@ import org.elasticsearch.packaging.util.Platforms;
|
||||
import org.elasticsearch.packaging.util.ServerUtils;
|
||||
import org.elasticsearch.packaging.util.Shell.Result;
|
||||
import org.junit.After;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.Before;
|
||||
import org.junit.BeforeClass;
|
||||
|
||||
@ -85,11 +84,6 @@ public class DockerTests extends PackagingTestCase {
|
||||
assumeTrue("only Docker", distribution().isDocker());
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
public static void teardownSuite() {
|
||||
removeContainer();
|
||||
}
|
||||
|
||||
@Before
|
||||
public void setupTest() throws IOException {
|
||||
installation = runContainer(distribution());
|
||||
@ -98,6 +92,7 @@ public class DockerTests extends PackagingTestCase {
|
||||
|
||||
@After
|
||||
public void teardownTest() {
|
||||
removeContainer();
|
||||
rm(tempDir);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user