Commit Graph

201 Commits

Author SHA1 Message Date
dependencies.io Bot acc5d2b537 Bump rubygems to version 3.5.9
- Updates rubygems/rubygems from 3.5.7 to 3.5.9

Changelog: changed
2024-04-30 22:46:18 +00:00
Balasankar 'Balu' C a18b0808cb Bump Omnibus to 9.0.19.2
- Updates Omnibus gem to 9.0.19.2 so GitFetcher
  selects the exact branch instead of the first
  branch when multiple branches match the
  requested version.

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8443

Changelog: changed

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-03-05 15:45:18 +00:00
Robert Marshall 10c817c6e5
Update Cinc/Ohai to 18.x series
- Add unf_ext gem because it is a direct dependency for Cinc versions
  greater than 18.0.169
- Updates Cinc gem from 17.10.95 to 18.3.0
- Updates Ohai gem from 17.9.0 to 18.1.3
- Updates software config for chef-bin, chef-gem, and ohai
- Remove ohai gem version workaround

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8294

Changelog: changed

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2024-01-25 10:09:14 -08:00
dependencies.io Bot 21f00cd956 Update rubygems from 3.4.22 to 3.5.1
Changelog: changed
2024-01-19 02:03:04 +00:00
Mayra Cabrera 45d008584d Revert "Merge branch 'chef-18-update' into 'master'"
This reverts merge request !6997
2024-01-17 21:02:55 +00:00
Robert Marshall db9b432193 Update Cinc/Ohai to 18.x series
- Add unf_ext gem because it is a direct dependency for Cinc versions
  greater than 18.0.169
- Updates Cinc gem from 17.10.95 to 18.3.0
- Updates Ohai gem from 17.9.0 to 18.1.3
- Updates software config for chef-bin, chef-gem, and ohai
- Remove ohai gem version workaround

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8294

Changelog: changed
Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2024-01-17 15:58:19 +00:00
Clemens Beck d7ed881347 Revert "Merge branch 'update-chef-gem' into 'master'"
This reverts merge request !7276
2024-01-13 13:59:53 +00:00
Clemens Beck 69abe66e77
Update chef from 17.10.0 to 17.10.95
Changelog: changed
2023-12-04 10:33:48 +01:00
Clemens Beck 20f9aad8b5
Update bundler from 2.4.13 to 2.4.22
Adds bundler to deps io to automate future updates.

Changelog: changed
2023-11-20 13:51:15 +01:00
Ryan Egesdahl c041314fe7 Use XZ compression for RPM packages
This is a follow-on to
https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7128
where we enabled XZ compression for DEB packages. Unfortunately, Omnibus
didn't do threaded compression for RPM packages because of the way it
was setting `_binary_payload`. That was causing XZ compression in
particular to take 2-3 times longer than GZip, so we could not merge
that change at the same time. With
https://gitlab.com/gitlab-org/omnibus/-/merge_requests/48 merged into
our fork, Omnibus will use threaded compression for RPM by default and
we can enable XZ compression for RPM packages as well.

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8222

Changelog: changed
2023-11-14 19:25:15 +00:00
Balasankar 'Balu' C a263339d5d Use google-cloud-storage gem for uploading packages to GCS
- Replace google cloud SDK with the google-cloud-storage gem
  thereby reducing the total footprint size of the builders

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8088

Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2023-09-29 22:08:40 +00:00
Balasankar 'Balu' C 389444b625 Bump Omnibus version to 9.0.19.0
- Updates Omnibus gem version from version 8.2.1.10
  to version 9.0.19.0

Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2023-06-16 22:14:00 +00:00
Dustin Collins 82bdaa5593 Update tomlib to v0.6.0 to correctly escape special characters
Changelog: changed
2023-06-12 08:54:37 +00:00
Balasankar 'Balu' C 3ea0efdac2 Merge branch 'sh-update-bundler-2.4.13' into 'master'
Update bundler to v2.4.13

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2023-05-16 05:07:02 +00:00
Stan Hu 5df3c4d34c Update Redis URL implementation to work with Ruby 3.1+
https://github.com/ruby/uri/pull/26 refactored how schemes are
registered in the `uri` gem. Ruby 3.1.4 - 3.2.2 ships with uri
v0.12.1, which has this change.

Changelog: fixed
2023-05-15 10:36:40 +00:00
Stan Hu b35f0e3dd0
Update bundler to v2.4.13
This fixes a warning when using CINC packages from PackageCloud:
https://github.com/rubygems/rubygems/issues/6614
2023-05-11 14:38:51 -07:00
Stan Hu 8ce19ddc48
Bump Bundler version to 2.4.12
This matches what GitLab Rails uses and prevents Omnibus from
installing the wrong native gems.

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/408338
2023-04-21 09:02:18 -07:00
Sami Hiltunen 4dff04a602 Match Praefect's configuration format in Omnibus
The configuration formats of Praefect and Omnibus deviate from each
other creating a few problems:

1. Configuration keys for the same option differ between the context of
   Omnibus and Praefect creating confusion for the user.

2. Each new key added requires duplicate work to map the different keys
   into Omnibus.

This change introduces praefect['configuration'] matching configuration
in Omnibus with Praefect's own format. The previous configuration keys
are remapped into this new format to assist administrators during the
transition period.

The tomlrb gem does not supporting encoding TOML, so the tomlib gem has
been added as a dependency. The configuration values are now serialized
directly into TOML instead of using a template.

Removes unneeded values allowing Praefect's own source to be the single
source of truth for configuration.

Updates tests because the new serialization method does not output empty
config sections.

Guards are included to prevent errors with latency configurations that
must be arrays where the previous configuration expected a string until
such time as Praefect's own validation subroutines are implemented.

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/7422

Changelog: changed
2023-02-17 04:12:08 +00:00
Hossein Pursultani 38a0e35faa Revert "Merge branch 'smh-generic-praefect-templating' into 'master'"
This reverts merge request !6373
2023-02-02 03:03:05 +00:00
Sami Hiltunen a82c788d46 Match Praefect's configuration format in Omnibus
The configuration formats between Praefect and Omnibus deviate from
each other.  This has a few problems:

1. The configuration keys differ in Omnibus from what Praefect uses. This
makes things confusing as the keys for the same options are different in
different contexts.

2. This forces us to duplicate the configuration in Omnibus' template to
map the different keys. This creates menial work and requires us to touch
Omnibus everytime new configuration keys are added.

This commit solves the problem by matching the configuration format of Praefect
in Omnibus completely with Praefect's own format. This is done by introducing the
submap Gitlab['praefect']['configuration'] which gets directly serialized as TOML.
As existing installations still depend on the old keys, compatbility code is added
to transfer the configuration to their new locations. We should later deprecate the
old keys and ask users to move the configuration to its new location.

Additionally, the unneeded default values are removed. This ensures the default
values are not duplicated and can be controlled for both source and Omnibus
installations by just updating Praefect's source.

As tomlrb does not support encoding TOML, dependency to tomlib was added to do so.

Tests had a slight change as the old template was outputting empty config sections
which are not needed. The new code outputs no unnecessary empty sections.

Changelog: changed
2023-02-01 18:45:29 +00:00
vincent_stchu aa48f1a2a4
Bump gem http to version 5.1.0 2022-11-25 15:48:57 +08:00
Jason Young 6785e0a132
Bump rspec and friends to 3.11 in omnibus
This enables us to take advantage of new counter methods in
rspec-expectations that allows for checking for duplicates and/or
an expected number of items (e.g. include(‘some string’).twice

Latest version is 3.12 - but inspec-core has a <= constraint for 3.11

Changelog: changed
Signed-off-by: Jason Young <jyoung@gitlab.com>
2022-11-04 14:58:46 -04:00
Robert Marshall 05b78653df Merge branch 'tnir-gitlab-styles-9.0.0-rubocop-1.36.0' into 'master'
Update gitlab-styles from 7.1.0 to 9.0.0 to update rubocop to 1.36.0

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Jason Plum <jplum@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2022-09-20 22:03:34 +00:00
Balasankar 'Balu' C 46cce40a56 Merge branch 'tnir-bundler-2.3.22' into 'master'
Update Bundler from 2.2.33 to 2.3.22 used in CI jobs

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2022-09-20 06:33:46 +00:00
Takuya Noguchi 83ff513f0f Update Bundler from 2.2.33 to 2.3.22 used in CI jobs
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2022-09-20 06:33:46 +00:00
Takuya Noguchi f973975eaf Update gitlab from 4.17.0 to 4.19.0
The gem is only used in check:package_size Rake task.

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2022-09-20 06:31:50 +00:00
Takuya Noguchi ee1c189130 Update gitlab-styles from 7.1.0 to 9.0.0
to update rubocop from 0.93.1 to 1.36.0.

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
Changelog: fixed
2022-09-15 15:06:20 +00:00
Balasankar 'Balu' C 18c9c3db7e Merge branch 'rp/retry-upload' into 'master'
Retry package upload

See merge request gitlab-org/omnibus-gitlab!6303
2022-09-14 06:29:14 +00:00
Takuya Noguchi dca6529508 Update chef-classroom to 1.0.5
Upgrade from 1.0.4 to 1.0.5 adds Ruby 3.0 support

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6980

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>

Changelog: other
2022-09-07 17:32:17 +00:00
Balasankar 'Balu' C 3bb1f91ea2 Bump Omnibus version to 8.2.1.10
Changelog: changed

Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2022-09-01 20:02:24 +00:00
Reuben Pereira a5f0ae8c3b Retry package upload
Use the retriable gem to retry uploading of packages if it fails.
It will retry 10 times, with a total wait time of about 6 minutes.
If the upload continues to fail, an exception will be raised.
2022-08-31 09:42:51 +05:30
Robert Marshall 2e70be7773 Merge branch 'tnir-gitlab-styles-to-7.1.0' into 'master'
Update gitlab-styles from 6.1.0 to 7.1.0

See merge request gitlab-org/omnibus-gitlab!6279
2022-08-26 16:41:11 +00:00
Robert Marshall 2ff2ad0d0f Merge branch 'tnir-update-aws-sdk-ec2-to-1.326.0' into 'master'
Update aws-sdk-ec2 from 1.197.0 to 1.327.0 and aws-sdk-marketplacecatalog from 1.7.0 to 1.22.0

See merge request gitlab-org/omnibus-gitlab!6257
2022-08-26 15:37:47 +00:00
Takuya Noguchi cb7b423577 Update aws-sdk-ec2 and aws-sdk-marketplacecatalog
- aws-sdk-ec2 from 1.197.0 to 1.327.0
- aws-sdk-marketplacecatalog from 1.7.0 to 1.22.0

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>

Changelog: other
2022-08-26 15:37:47 +00:00
Takuya Noguchi 6764d7ab3c Replace byebug and pry
- Replace byebug with ruby/debug
- Replaces pry with irb

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6955

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6956

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>

Changelog: other
2022-08-25 23:17:12 +00:00
Takuya Noguchi 275e615269 Update gitlab-styles from 6.1.0 to 7.1.0
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2022-08-18 05:30:13 +00:00
Robert Marshall 7db837f052 Merge branch 'remove-license-scout-usage' into 'master'
Update omnibus version to remove usage of license_scout

Closes #6196

See merge request gitlab-org/omnibus-gitlab!6260
2022-08-17 21:14:22 +00:00
Balasankar 'Balu' C f9736759c7 Update omnibus version to remove usage of license_scout
Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6196

Changelog: changed

Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2022-08-17 21:14:22 +00:00
Balasankar 'Balu' C 2ceee4c892 Use gitlab-dangerfiles gem
Use the common features such as changelog checks provided
by gitlab-dangerfiles and clean up the file structure for
easier maintenance and upkeep with the broader changes
across the organization.

Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2022-08-16 22:45:11 +00:00
Balasankar 'Balu' C 89e6cc120e Merge branch 'tnir-erubi-from-0.10.0-to-1.11.0' into 'master'
Update erubi from 1.10.0 to 1.11.0

See merge request gitlab-org/omnibus-gitlab!6256
2022-08-10 06:34:04 +00:00
Takuya Noguchi e1f2b452c8 Update erubi from 1.10.0 to 1.11.0
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
Changelog: other
2022-08-06 05:50:19 +00:00
Takuya Noguchi 081dcfbc1d Update rack from 2.2.3 to 2.2.4
Addresses CVE-2022-30122 and CVE-2022-30123.

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
Changelog: other
2022-08-06 01:35:52 +00:00
Takuya Noguchi cae0c78808 Update package_cloud from 0.3.05 to 0.3.09
- Updates package cloud and related gems, notably the thor gem
  which is used as part of Omnibus GitLab.

Changelog: changed

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2022-08-05 20:31:56 +00:00
Robert Marshall 58c494a8bc Update to CINC version 17.10
- cinc version 17.10 is ruby 3 compatible
- update ohai version now supports AlmaLinux and RockyLinux
- update related dependencies and chef ecosystem gems
- update Omnibus GitLab cookbooks to resolve deprecation warnings for
  upcoming behavior changes in cinc version 18.x
- update runit cookbook resources to support newer cinc version
- update crond_job extension to match changes in upstream crond resource
  related to newer versions of cinc

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2022-06-14 05:48:32 +00:00
DJ Mountney 4b18021f9c Merge branch 'bundle-frozen' into 'master'
Disallow bundle to any changes to Gemfile.lock

See merge request gitlab-org/omnibus-gitlab!6090
2022-05-24 21:37:52 +00:00
João Alexandre Cunha cd4f464c27 Disallow bundle to any changes to Gemfile.lock
It also explicitly installs the locked bundler version in our CIs.

This will harden security when executing bundle install.

Changelog: other
2022-05-24 21:37:52 +00:00
Robert Marshall 4dcfd171f5 Update Omnibus Gem Version
- Updates to Omnibus Gem 8.2.1.8 which now uses CINC upstream rubygems
  sources for `chef-utils` and `chef-config`

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6829

Related https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6405

Changelog: changed

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2022-05-11 01:42:52 -04:00
Balasankar 'Balu' C 6ed8bc2589 Merge branch '6404-migrate-to-parallel-cinc-version' into 'master'
Migrate from Chef to Cinc

Closes #6777 and #6404

See merge request gitlab-org/omnibus-gitlab!6032
2022-05-06 04:22:46 +00:00
Robert Marshall b892aa1bf4 Migrate to cinc from chef
- Use cinc as a replacement for Chef in Omnibus GitLab. To avoid
  conflating migration issues with upgrade issues, the change
  intentionally uses the cinc version that parallels the version of chef
  currently shipping in the Omnibus GitLab package.

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6404

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6777

Changelog: changed

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2022-05-06 04:22:45 +00:00
Balasankar "Balu" C 33d87b8f10 Add test coverage reports
Introduces simplecove test coverage tracking to the CI pipelines.

Related https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/4809

Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2022-05-02 18:42:58 -04:00