Commit Graph

17910 Commits

Author SHA1 Message Date
Balasankar 'Balu' C 6f0f625f4e Merge branch 'sh-use-bundler' into 'master'
Use bundler to install Omnibus gems

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2024-05-06 04:02:47 +00:00
Stan Hu 38bd8dffec Use bundler to install Omnibus gems
Instead of calling `gem install <x>` many times, let's define the
`Gemfile` and `Gemfile.lock` and run `bundle install`. This ensures
dependencies are pinned and don't quietly move with a new invocation
of `gem install`. There is also a side benefit to using `bundler`: we
can later use the newly-introduced feature to include and verify
checksums (https://github.com/rubygems/rubygems/pull/6374).

`bundler` generally installs everything in the expected gem directory
 that is used by `ruby`, but for gems installed from a Git source,
`bundler` puts those gems in a special `bundler/gems` directory.
We don't use any gems from Git sources now--`gitlab-ruby-shadow`
is now used instead of `ruby-shadow`--there is no issue.

Also, note that if we want to ensure `gitlab-ctl` doesn't try to pull
in gems from GitLab Rails, we could invoke `bundler`, but this is a
slightly riskier change.

Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8368

Changelog: changed
2024-05-06 04:02:46 +00:00
Robert Marshall d94cbec689 Merge branch 'mg-remove-min-max-concurrency' into 'master'
Remove deprecated min_concurrency and max_concurrency for Sidekiq

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Dustin Collins <714871-dustinmm80@users.noreply.gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Reviewed-by: Jason Plum <jplum@gitlab.com>
Co-authored-by: Ryan Egesdahl <regesdahl@gitlab.com>
Co-authored-by: Gregorius Marco <gmarco@gitlab.com>
2024-05-04 00:39:29 +00:00
Gregorius Marco cfa756435e Remove deprecated min_concurrency and max_concurrency for Sidekiq
- Eliminates code related to `min_concurrency` and
  `max_concurrency` options in sidekiq.

Related https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/3422

Changelog: removed
2024-05-04 00:39:29 +00:00
Andrew Patterson 7a83ad1d7c Merge branch 'deps/50129a2-a9e482e' into 'master'
Update gitlab-org/build/omnibus-mirror/node_exporter from 1.7.0 to 1.8.0

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

Merged-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Clemens Beck <cbeck@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2024-05-02 19:51:34 +00:00
Balasankar 'Balu' C f104a25b3e Merge branch 'deps/e771939-8485688' into 'master'
Update exiftool/exiftool from 12.82 to 12.84

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Clemens Beck <cbeck@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2024-05-02 07:29:33 +00:00
Ghost User f4fe427b0e Update exiftool from 12.82 to 12.83
Changelog: changed
2024-05-02 07:29:33 +00:00
Balasankar 'Balu' C 7eddda47df Merge branch 'sh-update-builder-image-revision-5.11' into 'master'
Update BUILDER_IMAGE_REVISION to v5.12.0

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2024-05-02 07:28:48 +00:00
Evan Read 105e970b9e Merge branch 'docs-lp-fix-links' into 'master'
Fix links in GitLab Omnibus project

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

Merged-by: Evan Read <eread@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Co-authored-by: Lysanne Pinto <lpinto@gitlab.com>
2024-05-02 00:48:55 +00:00
Lysanne Pinto 460e3ffd20 Fix links in GitLab Omnibus project 2024-05-02 00:48:55 +00:00
Andrew Patterson 504a0928a1 Merge branch 'deps/ca27c35-e2991f2' into 'master'
Update gitlab-org/build/omnibus-mirror/redis_exporter from 1.58.0 to 1.59.0

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

Merged-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: João Alexandre Cunha <j.a.cunha@gmail.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: Clemens Beck <cbeck@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2024-05-01 15:07:56 +00:00
Ghost User 8a1167a372 Update gitlab-org/build/omnibus-mirror/redis_exporter from 1.58.0 to 1.59.0
Changelog: changed
2024-05-01 15:07:56 +00:00
Robert Marshall 42c79aa2f8 Merge branch 'deps/4225d27-b2ed4f7' into 'master'
Update rubygems/rubygems from 3.5.7 to 3.5.9

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Jon Doveston <jdoveston@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Clemens Beck <cbeck@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2024-04-30 22:46:18 +00:00
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
Robert Marshall afa4d72b8f Merge branch 'eread/switch-to-lychee-for-link-checking' into 'master'
Switch to Lychee for link checking

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Reviewed-by: Evan Read <eread@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>
2024-04-30 22:41:28 +00:00
Evan Read 34e4de4d7d Switch to Lychee for link checking
Use Lychee instead of nanoc for link validation
in documentation.

Related https://gitlab.com/gitlab-org/technical-writing/-/issues/979
2024-04-30 22:41:28 +00:00
Andrew Patterson c10fe09dcb Merge branch 'deps/19dfc8b-351779a' into 'master'
Update gitlab-org/container-registry from v3.92.0-gitlab to v3.93.0-gitlab

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

Merged-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Clemens Beck <cbeck@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2024-04-30 22:30:45 +00:00
Jason Plum f99bb40bf8 Merge branch 'docs-add-ssh-error-troubleshooting' into 'master'
Add section about troubleshooting SSH push/pull error

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

Merged-by: Jason Plum <jplum@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Approved-by: Jason Plum <jplum@gitlab.com>
Reviewed-by: Evan Read <eread@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>
Co-authored-by: Alexandr Tanayno <atanayno@gitlab.com>
2024-04-29 16:17:28 +00:00
Alexandr Tanayno 668e97e1fa Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Evan Read <eread@gitlab.com>
2024-04-29 16:17:27 +00:00
Fiona Neill 59cb03c01c Merge branch 'mmj-multi-db' into 'master'
Update Docs: 17.0 Remove support for single database connection

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

Merged-by: Fiona Neill <fneill@gitlab.com>
Approved-by: Fiona Neill <fneill@gitlab.com>
Co-authored-by: Manoj M J <mmj@gitlab.com>
2024-04-29 13:24:20 +00:00
Manoj M J 9be1159647 Update Docs: 17.0 Remove support for single database connection 2024-04-29 13:24:20 +00:00
Robert Marshall 6fab34cacb Merge branch 'pin-parser-version-in-chef-bin' into 'master'
Pin parser dependency in chef-bin

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Ryan Egesdahl <deriamis@gmail.com>
2024-04-27 01:11:20 +00:00
Ryan Egesdahl bc8d3785aa Pin parser dependency in chef-bin
Installing chef-bin via `gem install` makes all of its dependencies floating,
including the `parser` gem. Because the `parser` gem is *also* used by other
Ruby modules, the floating dependencies can cause failures, such as a recent
problem that caused `gitlab-ctl` to fail because `inspec-core` depends on
`parser` as well. This is a temporary fix to correct the floating dependency
on `parser` until a more permanent fix is in place.
2024-04-27 01:11:20 +00:00
Robert Marshall 32ad31df9c Merge branch 'sh-fix-redis-default-host-with-sentinels' into 'master'
Fix reconfigure failure if Redis node has Rails Sentinel config

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Mitchell Nielsen <mnielsen@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2024-04-26 21:13:18 +00:00
deps a7d0064fd6 Update gitlab-org/build/omnibus-mirror/node_exporter from 1.7.0 to 1.8.0
Changelog: changed
2024-04-25 04:02:04 +00:00
deps ea5a0327d4 Update gitlab-org/container-registry from v3.92.0-gitlab to v3.93.0-gitlab
Changelog: changed
2024-04-25 04:01:59 +00:00
Stan Hu 1c579dae4d
Fix reconfigure failure if Redis node has Rails Sentinel config
https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7500
introduced a regression when a node with a managed Redis node has
Sentinels configured in `gitlab_rails` section. Previously the
`redis['default_host']` would only be set if
`gitlab_rails['redis_sentinels']` were empty.

Relates to
https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8465#note_1879691545

Changelog: fixed
2024-04-24 20:53:36 -07:00
GitLab Release Tools Bot 1f0bfa5da5 Merge remote-tracking branch 'dev/master' 2024-04-24 14:56:05 +00:00
GitLab Bot 6458f79220 Automatic merge of gitlab-org/omnibus-gitlab master 2024-04-24 13:05:35 +00:00
Achilleas Pipinellis d07c931112 Merge branch 'brad-hyphenate-docs' into 'master'
Hyphenate PEM encoded

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

Merged-by: Achilleas Pipinellis <axil@gitlab.com>
Approved-by: Achilleas Pipinellis <axil@gitlab.com>
Co-authored-by: Brad Sevy <bsevy@gitlab.com>
2024-04-24 11:09:55 +00:00
GitLab Release Tools Bot 14db466319 Update changelog for 16.9.6
[ci skip]
2024-04-24 09:16:07 +00:00
GitLab Release Tools Bot 6e46c55ec1 Update changelog for 16.10.4
[ci skip]
2024-04-24 08:57:59 +00:00
GitLab Release Tools Bot 7b6a84adcc Update changelog for 16.11.1
[ci skip]
2024-04-24 08:46:10 +00:00
Stan Hu 03c505786c
Update BUILDER_IMAGE_REVISION to v5.12.0
v5.11.0 updates Node.js from v18.17 to v20.12:
https://gitlab.com/gitlab-org/gitlab-omnibus-builder/-/merge_requests/337

Changelog: changed
2024-04-23 23:00:33 -07:00
Balasankar 'Balu' C 6df77b3a42 Merge branch 'sv-remove-reliable' into 'master'
Remove reliable from test runs

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Vishal Patel <vpatel@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Sofia Vistas <svistas@gitlab.com>
2024-04-24 04:08:05 +00:00
Sofia Vistas 3c6fb28eb2 Remove reliable tag from QA test runs 2024-04-24 04:08:05 +00:00
Balasankar 'Balu' C ef9331b689 Merge branch 'mg-remove-queue-selector-and-negate-options' into 'master'
Remove queue_selector and negate options from Sidekiq

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Gregorius Marco <gmarco@gitlab.com>
2024-04-24 03:59:55 +00:00
Gregorius Marco cae9ce603e Remove queue_selector and negate options from Sidekiq
https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/2220

Changelog: removed
2024-04-24 03:59:55 +00:00
Marcin Sedlak-Jakubowski 24eb6bbfeb Merge branch 'asmaa.hassan-master-patch-f1b5' into 'master'
Removing references of old versions of distribution:deply | omnibus docs

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

Merged-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Approved-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Reviewed-by: Evan Read <eread@gitlab.com>
Co-authored-by: Achilleas Pipinellis <axil@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>
Co-authored-by: Asmaa Hassan <ahassanahmed@gitlab.com>
2024-04-23 20:34:59 +00:00
Asmaa Hassan 80728911e4 Removing references of old versions of distribution:deply | omnibus docs 2024-04-23 20:34:58 +00:00
Ian Baum ba9ca699aa Merge branch 'ngala/namespace-in-path-auth-redirect-uri' into 'master'
Update default pages auth-redirect-uri when namespace-in-path is enabled

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

Merged-by: Ian Baum <ibaum@gitlab.com>
Approved-by: Vladimir Shushlin <vshushlin@gitlab.com>
Approved-by: Mitchell Nielsen <mnielsen@gitlab.com>
Approved-by: Ian Baum <ibaum@gitlab.com>
Co-authored-by: ngala <ngala@gitlab.com>
2024-04-23 14:46:46 +00:00
Andrew Patterson 82c190a3e9 Merge branch 'mattermost-9.7.1' into 'master'
Update Mattermost to 9.7.1

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

Merged-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Clemens Beck <cbeck@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: Akis Maziotis <akis.maziotis@mattermost.com>
2024-04-22 22:21:25 +00:00
Balasankar 'Balu' C e8cecdcf2e Merge branch 'sh-fix-missing-log-arguments' into 'master'
Fix missing arguments when PostgreSQL upgrade times out

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2024-04-20 06:45:57 +00:00
Stan Hu 39fa902e77
Fix missing arguments when PostgreSQL upgrade times out
This is a small regression from
https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7247.
When the PostgreSQL upgrade times out, previously the script
would error out with `wrong number of arguments (given 0, expected 1)
(ArgumentError)`.

Changelog: fixed
2024-04-19 23:15:08 -07:00
Robert Marshall 4334402cad Merge branch '8490-fix-rat-fips-package-url' into 'master'
Fix RAT_FIPS_PACKAGE_URL not having fips suffix in path

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

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 17:25:00 +00:00
Balasankar 'Balu' C 7eeb584a40
Fix RAT_FIPS_PACKAGE_URL not having fips suffix in path
While generating package information, specify fips argument for FIPS
package URLs. Also ensure the correct package folder is used in those
URLs.

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 15:11:51 +05:30
Balasankar 'Balu' C fecc1240f3
Make package info methods take fips as argument
Package related information can have different values for FIPS packages
and regular packages. For builds, USE_SYSTEM_SSL variable controls if
the FIPS specific information should be used. However, while generating
facts, we need to specifically retreive FIPS specific information too,
in addition to regular one. So, accept fips as an argument to the
relevant methods that can be specified while generating facts.

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 15:08:11 +05:30
Robert Marshall 8264314f7d Merge branch 'docker-buildx-helper' into 'master'
Add foundation to build multiarch images

Closes #8469 and #8470

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Dmytro Makovey <dmakovey@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Reviewed-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 04:14:50 +00:00
Balasankar 'Balu' C ca02e0c220
Enable building arm64 images
Modify the Dockerfile and library code around Docker image builds to
support building multiarch images. The Dockerfile will download the
package for the correct architecture based on TARGETARCH variable.

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

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 08:40:38 +05:30
Balasankar 'Balu' C f8c71c7a9c
Use docker buildx to build Docker images
Move away from docker-api gem which does not have support for `docker
buildx`. Add a wrapper to execute `docker buildx` commands in the shell
and use that for Docker operations.

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

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 08:40:16 +05:30