From 37134ebaeb1c6d17edbc84253406ebb4142c9aa3 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 27 May 2025 13:26:00 -0700 Subject: [PATCH] Don't ask to delete an image without an external id A provider can't delete an image upload without an external id, so if we are deleting an upload that failed early enough not to have one, don't ask the provider to try to delete it. Just proceed to delete the ZK record. Change-Id: Ifd5ef4d26b1231b042f922fe7227972d434cccd5 --- zuul/launcher/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zuul/launcher/server.py b/zuul/launcher/server.py index 6608f7c77c..ddd3c39e1f 100644 --- a/zuul/launcher/server.py +++ b/zuul/launcher/server.py @@ -132,7 +132,8 @@ class DeleteJob: provider_cname = self.upload.providers[0] provider = self.launcher.\ _getProviderByCanonicalName(provider_cname) - provider.deleteImage(self.upload.external_id) + if self.upload.external_id: + provider.deleteImage(self.upload.external_id) self.upload.delete(ctx) self.launcher.upload_deleted_event.set() self.launcher.wake_event.set()