Fix intermittent test failures for missing busybox image

shanejbrown · Aug 21, 2024 · ee34aa5 · ee34aa5
1 parent 9e31cd1
commit ee34aa5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/buildrunner/docker/daemon.py b/buildrunner/docker/daemon.py
@@ -74,8 +74,10 @@ def start(self):
                 self._env["DOCKER_HOST"] = "unix:///dockerdaemon/docker.sock"
 
         # create and start the Docker container
+        image_name = f"{self.docker_registry}/busybox:latest"
+        self.docker_client.pull(image_name)
         self._daemon_container = self.docker_client.create_container(
-            f"{self.docker_registry}/busybox:latest",
+            image_name,
             command="/bin/sh",
             volumes=_volumes,
             host_config=self.docker_client.create_host_config(binds=_binds),

diff --git a/tests/test_push_artifact.py b/tests/test_push_artifact.py
@@ -21,6 +21,8 @@ def _test_buildrunner_file(
             top_dir_path,
             "-b",
             temp_dir,
+            # Since we are using a fresh temp directory, don't delete it first
+            "--keep-step-artifacts",
             "-f",
             os.path.join(test_dir, file_name),
         ]