Skip to content

Commit 8ab0f2f

Browse files
Robert Marshallderiamis
andcommitted
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: Robert Marshall <[email protected]> Approved-by: Clemens Beck <[email protected]> Approved-by: Robert Marshall <[email protected]> Reviewed-by: Clemens Beck <[email protected]> Co-authored-by: Ryan Egesdahl <[email protected]>
2 parents 1830c9c + c041314 commit 8ab0f2f

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GIT
22
remote: https://gitlab.com/gitlab-org/omnibus.git
3-
revision: 358f4af204fe9b2899ab99e0c8975b97c13dddf5
4-
tag: 9.0.19.0
3+
revision: bed44a1bd07586f2338ffc04e9fc25b74154ad63
4+
tag: 9.0.19.1
55
specs:
66
omnibus (9.0.19)
77
aws-sdk-s3 (~> 1.116.0)

OMNIBUS_GEM_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.0.19.0
1+
9.0.19.1

config/projects/gitlab.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
signing_passphrase Gitlab::Util.get_env('GPG_PASSPHRASE')
278278

279279
# Enable XZ compression if selected
280-
compress_xz = Gitlab::Util.get_env('COMPRESS_XZ') || 'false'
280+
compress_xz = Gitlab::Util.get_env('COMPRESS_XZ') || 'true'
281281
if compress_xz == 'true'
282282
compression_type :xz
283283
compression_level 6

doc/build/build_package.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,14 @@ project's [Container Registry](https://gitlab.com/gitlab-org/gitlab-omnibus-buil
6666

6767
1. By default, XZ compression is used to produce the final DEB package,
6868
which reduces the package size by nearly 30% in comparison to Gzip, with
69-
little to no increase in build time. However, the system's package
70-
manager must also support the format. If your system's package manager does
71-
not support XZ packages, set the `COMPRESS_XZ` environment variable to `false`:
69+
little to no increase in build time and a slight increase in installation
70+
(decompression) time. However, the system's package manager must also support
71+
the format. If your system's package manager does not support XZ packages,
72+
set the `COMPRESS_XZ` environment variable to `false`:
7273

7374
```shell
7475
export COMPRESS_XZ=false
7576
```
76-
77-
NOTE: This is feature is disabled by default on RPM platforms due to an
78-
as-yet-unexplained increase in packaging time. It can be enabled by setting
79-
the `COMPRESS_XZ` environment variable to `true`.
8077

8178
1. Install the libraries and other dependencies:
8279

0 commit comments

Comments
 (0)