Merge pull request #176 from bluesliverx/main

Handle container errors correctly

buildrunner/__init__.py

@@ -18,6 +18,7 @@
 import sys
 import tarfile
 import tempfile
+import traceback
 import types
 from typing import List, Optional
 
@@ -35,6 +36,7 @@
 from buildrunner.errors import (
     BuildRunnerConfigurationError,
     BuildRunnerProcessingError,
+    BuildRunnerError,
 )
 from buildrunner.steprunner import BuildStepRunner
 from buildrunner.docker.multiplatform_image_builder import MultiplatformImageBuilder
@@ -471,12 +473,6 @@ def run(self):  # pylint: disable=too-many-statements,too-many-branches,too-many
                 else:
                     self.log.write("\nPush not requested\n")
 
-        except BuildRunnerConfigurationError as brce:
-            exit_explanation = str(brce)
-            self.exit_code = os.EX_CONFIG
-        except BuildRunnerProcessingError as brpe:
-            exit_explanation = str(brpe)
-            self.exit_code = 1
         except requests.exceptions.ConnectionError as rce:
             print(str(rce))
             exit_explanation = (
@@ -486,6 +482,17 @@ def run(self):  # pylint: disable=too-many-statements,too-many-branches,too-many
                 "remote PyPi server information is set correctly."
             )
             self.exit_code = 1
+        except ImageNotFound as inf:
+            exit_explanation = f"Image not found: {inf.explanation}"
+            self.exit_code = os.EX_CONFIG
+        except BuildRunnerError as exc:
+            exit_explanation = str(exc)
+            self.exit_code = (
+                os.EX_CONFIG if isinstance(exc, BuildRunnerConfigurationError) else 1
+            )
+        except Exception as exc:
+            exit_explanation = f"Encountered unhandled exception ({type(exc).__name__}) {traceback.format_exc()}"
+            self.exit_code = 1
 
         finally:
             self._write_artifact_manifest()

tests/test-files/test-docker-pull-failure.yaml

@@ -2,5 +2,5 @@
 steps:
   use-bogus-image:
     run:
-      image: user1/buildrunner-test-multi-platform:bogus
+      image: user1/buildrunner-bogus-image:bogus
       cmd: echo "Hello World"