ソースを参照

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.
Rory Hunter 5 年 前
コミット
4c15092491

+ 0 - 0
distribution/docker/aarch64-docker-build-context/build.gradle → distribution/docker/docker-aarch64-build-context/build.gradle


+ 0 - 0
distribution/docker/aarch64-docker-export/build.gradle → distribution/docker/docker-aarch64-export/build.gradle


+ 0 - 0
distribution/docker/aarch64-oss-docker-build-context/build.gradle → distribution/docker/oss-docker-aarch64-build-context/build.gradle


+ 0 - 0
distribution/docker/aarch64-oss-docker-export/build.gradle → distribution/docker/oss-docker-aarch64-export/build.gradle


+ 1 - 6
qa/os/src/test/java/org/elasticsearch/packaging/test/DockerTests.java

@@ -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;
 
@@ -79,11 +78,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());
@@ -92,6 +86,7 @@ public class DockerTests extends PackagingTestCase {
 
     @After
     public void teardownTest() {
+        removeContainer();
         rm(tempDir);
     }