Record the instance name in report for all kinds of exceptions.
Bug: 147620882
Test: acloud-dev create --boot-timeout 10 --report-file report.json
acloud-dev create_cf --build-target cf_x86_phone-userdebug --branch git_master \
--build-id 6130475 --boot-timeout 450 --no-autoconnect --multi-stage-launch \
--report_file test.json -vv
Change-Id: Ied6d195510843f9eadb4c0d18590fa9921c63896
diff --git a/internal/lib/cvd_compute_client_multi_stage.py b/internal/lib/cvd_compute_client_multi_stage.py
index cc48e34..2c1821c 100644
--- a/internal/lib/cvd_compute_client_multi_stage.py
+++ b/internal/lib/cvd_compute_client_multi_stage.py
@@ -141,7 +141,7 @@
self.StopCvd()
self.CleanUp()
- # pylint: disable=arguments-differ,too-many-locals
+ # pylint: disable=arguments-differ,too-many-locals,broad-except
def CreateInstance(self, instance, image_name, image_project,
build_target=None, branch=None, build_id=None,
kernel_branch=None, kernel_build_id=None,
@@ -219,7 +219,7 @@
boot_timeout_secs=self._boot_timeout_secs)
return instance
- except errors.DriverError as e:
+ except Exception as e:
self._all_failures[instance] = e
return instance
