Skip to content

Drop use of `git` in vendored Sidekiq gem

Stan Hu requested to merge sh-fix-vendor-sidekiq-gemspec into master

What does this MR do and why?

We vendored Sidekiq in !142986 (merged). However, in Cloud Native GitLab, git isn't present, and the Git data isn't available, so we cannot rely on this.

MR acceptance checklist

Screenshots or screen recordings

Previously the use of git caused all sorts of warning messages:

In https://gitlab.com/gitlab-org/build/CNG/-/jobs/6075294257, I see:

#51 [builder 15/20] RUN cd /srv/gitlab &&     sudo -u git -H bundle config set --local clean 'true' &&     sudo -u git -H bundle config set --local deployment 'true' &&     sudo -u git -H bundle config set --local without 'development test mysql aws' &&     sudo -u git -H bundle install --jobs 4 --retry 5
#51 3.919 fatal: not a git repository (or any of the parent directories): .git
#51 5.122 Fetching gem metadata from https://rubygems.org/.......
#51 16.20 Fetching rake 13.0.6

On the container, I see this too:

git@gitlab-webservice-default-57cdbcd679-cbp4q:/srv/gitlab$ bin/rails c
sh: 1: git: not found
--------------------------------------------------------------------------------
 Ruby:         ruby 3.1.4p223 (2023-03-30 revision 957bb7cb81) [x86_64-linux]
 GitLab:       16.9.0-pre (680f2372f67) EE
 GitLab Shell: 14.33.0
 PostgreSQL:   14.8
------------------------------------------------------------[ booted in 19.30s ]
Loading production environment (Rails 7.0.8)
irb(main):001:0>

How to set up and validate locally

  1. Check out this branch.
  2. gdk restart rails-background-jobs
  3. Make sure it still runs.
Edited by Stan Hu

Merge request reports