#2028 make xz options configurable
Merged 2 years ago by tkopecek. Opened 2 years ago by tkopecek.
tkopecek/koji issue1901  into  master

file modified
+2 -1
@@ -4093,7 +4093,7 @@ 

                                'xz-cp-%s-%s.log' % (format, self.arch))

          log_output(self.session, cmd[0], cmd, conlog, self.getUploadDir(),

                     logerror=1)

-         cmd = ['/usr/bin/xz', '-z9T2', rawimg]

+         cmd = ['/usr/bin/xz', self.options.xz_options, rawimg]

          conlog = os.path.join(self.workdir,

                                'xz-%s-%s.log' % (format, self.arch))

          log_output(self.session, cmd[0], cmd, conlog, self.getUploadDir(),
@@ -6371,6 +6371,7 @@ 

                  'failed_buildroot_lifetime': 3600 * 4,

                  'rpmbuild_timeout': 3600 * 24,

                  'oz_install_timeout': 0,

+                 'xz_options': '-z6T0',

                  'task_avail_delay': 300,

                  'cert': None,

                  'ca': '',  # FIXME: Unused, remove in next major release

file modified
+3
@@ -116,6 +116,9 @@ 

  ;if set to True, failing subtask will not automatically cancel other siblings

  ;build_arch_can_fail = False

  

+ ;image build with raw-xz type will use following xz options

+ ;xz_options=-z6T0

+ 

  ;if set to True additional logs with timestamps will get created and uploaded

  ;to hub. It could be useful for debugging purposes, but creates twice as many

  ;log files

@@ -170,6 +170,11 @@ 

        This value is used for waiting on all xmlrpc calls to hub. By default

        there is no timeout set.

  

+    xz_options=-z6T0

+       Image builds with ``raw-xz`` type will use this setting when compressing

+       the image. Default value is compromise between speed and resource usage.

+       Only one option (not space-separated) is allowed here for now.

+ 

  RPM Builds

  ^^^^^^^^^^

  .. glossary::

Do we need to support space separated options here?

I don't think so. For now, this is the only usecase.

We should probably note that limitation in the docs, then.

rebased onto 8200a38ce380fcdb6f9acdaccb1ef135dfd14cb6

2 years ago

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

2 years ago

pretty please pagure-ci rebuild

2 years ago

rebased onto ab61a8b

2 years ago

Metadata Update from @jcupova:
- Pull-request tagged with: testing-done

2 years ago

Commit 8c9558a fixes this pull-request

Pull-Request has been merged by tkopecek

2 years ago