Skip to content
Snippets Groups Projects
Commit 6ead66b83923 authored by Robert Marshall's avatar Robert Marshall
Browse files

Merge branch...

Merge branch '8222-spike-investigate-why-xz-packaging-on-rpm-platforms-has-poor-performance' into 'master'

Use XZ compression for RPM packages

Closes #8222

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7184



Merged-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Approved-by: default avatarClemens Beck <cbeck@gitlab.com>
Approved-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Reviewed-by: default avatarClemens Beck <cbeck@gitlab.com>
Co-authored-by: default avatarRyan Egesdahl <deriamis@gmail.com>
No related branches found
No related tags found
3 merge requests!119heptapod#1448: making Heptapod 1.1 the new oldstable,!116heptapod#1395: make 1.1 the new stable,!115Merged upstream 16.7 stable branches first commit
GIT
remote: https://gitlab.com/gitlab-org/omnibus.git
revision: 358f4af204fe9b2899ab99e0c8975b97c13dddf5
tag: 9.0.19.0
revision: bed44a1bd07586f2338ffc04e9fc25b74154ad63
tag: 9.0.19.1
specs:
omnibus (9.0.19)
aws-sdk-s3 (~> 1.116.0)
......
9.0.19.0
9.0.19.1
......@@ -277,7 +277,7 @@
signing_passphrase Gitlab::Util.get_env('GPG_PASSPHRASE')
# Enable XZ compression if selected
compress_xz = Gitlab::Util.get_env('COMPRESS_XZ') || 'false'
compress_xz = Gitlab::Util.get_env('COMPRESS_XZ') || 'true'
if compress_xz == 'true'
compression_type :xz
compression_level 6
......
......@@ -66,10 +66,11 @@
1. By default, XZ compression is used to produce the final DEB package,
which reduces the package size by nearly 30% in comparison to Gzip, with
little to no increase in build time. However, the system's package
manager must also support the format. If your system's package manager does
not support XZ packages, set the `COMPRESS_XZ` environment variable to `false`:
little to no increase in build time and a slight increase in installation
(decompression) time. However, the system's package manager must also support
the format. If your system's package manager does not support XZ packages,
set the `COMPRESS_XZ` environment variable to `false`:
```shell
export COMPRESS_XZ=false
```
......@@ -72,11 +73,7 @@
```shell
export COMPRESS_XZ=false
```
NOTE: This is feature is disabled by default on RPM platforms due to an
as-yet-unexplained increase in packaging time. It can be enabled by setting
the `COMPRESS_XZ` environment variable to `true`.
1. Install the libraries and other dependencies:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment