Revert "image: support xz compressed raw files"

This reverts commit 1cbc534d89.

builder/kojid

@@ -2969,7 +2969,7 @@ class BaseImageTask(OzImageTask):
         we have to do this. rhevm-ova requires rhevm, but if the user did not
         request it, we should not pass it back up.
         """
-        supported = ('raw', 'raw-xz', 'vmdk', 'qcow', 'qcow2', 'vdi', 'rhevm-ova', 'vsphere-ova', 'docker')
+        supported = ('raw', 'vmdk', 'qcow', 'qcow2', 'vdi', 'rhevm-ova', 'vsphere-ova', 'docker')
         for f in formats:
             if f not in supported:
                 raise koji.ApplianceError('Invalid format: %s' % f)
@@ -3095,27 +3095,6 @@ class BaseImageTask(OzImageTask):
                 base.base_image.parameters['libvirt_xml'])
             images[format] = {'image': newimg, 'libvirt': lxml}
 
-        # xz compress the raw disk image if asked for
-        for format in ('raw-xz',):
-            if format not in self.formats:
-                continue
-            newimg = os.path.join(self.workdir, imgname + 'raw.xz')
-            rawimg = os.path.join(self.workdir, imgname + 'raw')
-            cmd = ['/bin/cp', base.base_image.data, rawimg]
-            conlog = os.path.join(self.workdir,
-                'xz-cp-%s-%s.log' % (format, arch))
-            log_output(self.session, cmd[0], cmd, conlog,
-                self.getUploadDir(), logerror=1)
-            cmd = ['/usr/bin/xz', '-z', rawimg]
-            conlog = os.path.join(self.workdir,
-                'xz-%s-%s.log' % (format, arch))
-            log_output(self.session, cmd[0], cmd, conlog,
-                self.getUploadDir(), logerror=1)
-            lxml = self.fixImageXML(format, imgname,
-                'libvirt-%s-%s.xml' % (format, arch),
-                base.base_image.parameters['libvirt_xml'])
-            images[format] = {'image': newimg, 'libvirt': lxml}
-
         return images
 
     def handler(self, name, version, release, arch, target_info, build_tag, repo_info, inst_tree, opts=None):
@@ -3207,8 +3186,6 @@ class BaseImageTask(OzImageTask):
                 newname = imgname + '.' + format.replace('-', '.')
             elif format == 'docker':
                 newname = imgname + '.' + 'tar.gz'
-            elif format == 'raw-xz':
-                newname = imgname + '.' + 'raw.xz'
             else:
                 newname = imgname + '.' + format
             if format != 'docker':

cli/koji

@@ -5113,7 +5113,7 @@ def handle_spin_appliance(options, session, args):
         help=_("Set the number of virtual cpus in the appliance, " +
                "default is 1"))
     parser.add_option("--format", metavar="DISK_FORMAT", default='raw',
-        help=_("Disk format, default is raw. Other options are raw-xz, qcow, " +
+        help=_("Disk format, default is raw. Other options are qcow, " +
                "qcow2, and vmx."))
 
     (task_options, args) = parser.parse_args(args)
@@ -5130,7 +5130,7 @@ def handle_spin_appliance(options, session, args):
 def handle_image_build(options, session, args):
     """Create a disk image given an install tree"""
     formats = ('vmdk', 'qcow', 'qcow2', 'vdi', 'rhevm-ova', 'vsphere-ova',
-               'docker', 'raw-xz')
+               'docker')
     usage = _("usage: %prog image-build [options] <name> <version> " +
               "<target> <install-tree-url> <arch> [<arch>...]")
     usage += _("\n       %prog image-build --config FILE")

docs/schema-upgrade-1.9-next.sql

@@ -1,9 +0,0 @@
--- schema migration from version 1.9 to next
--- note: this update will require additional steps, please see the migration doc
-
-BEGIN;
-
--- new archive types
-insert into archivetypes (name, description, extensions) values ('raw-xz', 'xz compressed raw disk image', 'raw.xz');
-
-COMMIT;

docs/schema.sql

@@ -713,7 +713,6 @@ insert into archivetypes (name, description, extensions) values ('pdb', 'Windows
 insert into archivetypes (name, description, extensions) values ('oem', 'Windows driver oem file', 'oem');
 insert into archivetypes (name, description, extensions) values ('iso', 'CD/DVD Image', 'iso');
 insert into archivetypes (name, description, extensions) values ('raw', 'Raw disk image', 'raw');
-insert into archivetypes (name, description, extensions) values ('raw-xz', 'xz compressed raw disk image', 'raw.xz');
 insert into archivetypes (name, description, extensions) values ('qcow', 'QCOW image', 'qcow');
 insert into archivetypes (name, description, extensions) values ('qcow2', 'QCOW2 image', 'qcow2');
 insert into archivetypes (name, description, extensions) values ('vmdk', 'vSphere image', 'vmdk');