Fix docker image pull retry

2 files changed, 4 insertions, 18 deletions

diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java
index 4e2567b9fa8..310fb4ffdd3 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerTest.java
@@ -14,7 +14,6 @@ import java.util.concurrent.ExecutionException;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
@@ -30,21 +29,6 @@ public class DockerTest {
     private static final DockerImage dockerImage = new DockerImage("simple-ipv6-server:Dockerfile");
     private static final String MANAGER_NAME = "docker-test";
 
-    // It is ignored since it is a bit slow and unstable, at least on Mac.
-    @Ignore
-    @Test
-    public void testDockerImagePullDelete() throws ExecutionException, InterruptedException {
-        DockerImage dockerImage = new DockerImage("busybox:1.24.0");
-
-        // Pull the image and wait for the pull to complete
-        docker.pullImageAsync(dockerImage).get();
-        assertTrue("Failed to download " + dockerImage.asString() + " image", docker.imageIsDownloaded(dockerImage));
-
-        // Remove the image
-        docker.deleteImage(dockerImage);
-        assertFalse("Failed to delete " + dockerImage.asString() + " image", docker.imageIsDownloaded(dockerImage));
-    }
-
     // Ignored because the test is very slow (several minutes) when swap is enabled, to disable: (Linux)
     // $ sudo swapoff -a
     @Ignore
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java
index 5f090abec71..915b3b53867 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java
@@ -151,9 +151,11 @@ public class RunSystemTests {
     }
 
     private void buildVespaSystestDockerImage(Docker docker, DockerImage vespaBaseImage) throws IOException, ExecutionException, InterruptedException {
-        if (!docker.imageIsDownloaded(vespaBaseImage)) {
+        if (docker.pullImageAsyncIfNeeded(vespaBaseImage)) {
             logger.info("Pulling " + vespaBaseImage.asString() + " (This may take a while)");
-            docker.pullImageAsync(vespaBaseImage).get();
+            while (docker.pullImageAsyncIfNeeded(vespaBaseImage)) {
+                Thread.sleep(5000);
+            };
         }
 
         Path systestBuildDirectory = pathToVespaRepoInHost.resolve("docker-api/src/test/resources/systest/");