From 170eee385ea8466b279454a9dda9e3e637579662 Mon Sep 17 00:00:00 2001
From: Igor Raits <igor.raits@gmail.com>
Date: Jan 03 2022 10:49:12 +0000
Subject: Upload all file types after kiwi build


Signed-off-by: Igor Raits <igor.raits@gmail.com>

---

diff --git a/plugins/builder/kiwi.py b/plugins/builder/kiwi.py
index 83cffc1..4767592 100644
--- a/plugins/builder/kiwi.py
+++ b/plugins/builder/kiwi.py
@@ -393,17 +393,10 @@ class KiwiCreateImageTask(BaseBuildTask):
         if os.path.exists(root_log_path):
             self.uploadFile(root_log_path, remoteName="image-root.log")
 
-        # for type in types:
-        #     img_file = '%s.%s-%s.%s' % (name, version, arch, type)
-        #     self.uploadFile(os.path.join(broot.rootdir()), remoteName=img_file)
-        #     imgdata['files'].append(img_file)
-        for ftype in ('disk_format_image', 'installation_image'):
-            fdata = result.result_files.get(ftype)
-            if not fdata:
-                continue
+        for ftype, fdata in result_files.items():
             fpath = os.path.join(broot.rootdir(), fdata.filename[1:])
             img_file = os.path.basename(fpath)
-            self.uploadFile(fpath, remoteName=os.path.basename(img_file))
+            self.uploadFile(fpath, remoteName=img_file)
             imgdata['files'].append(img_file)
 
         if not self.opts.get('scratch'):