Merge branch 'sh-squelch-experimental-warnings-puma-sidekiq' into 'master'

Suppress Ruby experimental warning messages for Puma, Sidekiq

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

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Stan Hu <[email protected]>

Author: balasankarc

files/gitlab-cookbooks/gitlab/templates/default/sv-puma-run.erb

@@ -5,12 +5,14 @@ exec 2>&1
 
 <%= render("make_metrics_rundir.erb") %>
 <%= render("mount_point_check.erb") %>
+rubyopt="-W:no-experimental"
 
 exec chpst -P \
   -u <%= @options[:user] %>:<%= @options[:groupname] %> \
   -U <%= @options[:user] %>:<%= @options[:groupname] %> \
   -e /opt/gitlab/etc/gitlab-rails/env \
   /usr/bin/env \
+    RUBYOPT="${rubyopt}" \
     prometheus_multiproc_dir="${prometheus_run_dir}" \
     ACTION_CABLE_WORKER_POOL_SIZE=<%= @options[:actioncable_worker_pool_size] %> \
     /opt/gitlab/embedded/bin/bundle exec puma -C <%= @options[:puma_rb] %>

files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb

@@ -5,10 +5,13 @@ cd <%= node['gitlab']['gitlab_rails']['dir'] %>/working
 exec 2>&1
 <%= render("make_metrics_rundir.erb", cookbook: 'gitlab') %>
 <%= render("mount_point_check.erb", cookbook: 'gitlab') %>
+rubyopt="-W:no-experimental"
+
 exec chpst -e /opt/gitlab/etc/gitlab-rails/env -P \
   -U <%= @options[:user] %>:<%= @options[:groupname] %> \
   -u <%= @options[:user] %>:<%= @options[:groupname] %> \
   /usr/bin/env \
+    RUBYOPT="${rubyopt}" \
     prometheus_multiproc_dir="${prometheus_run_dir}" \
     /opt/gitlab/embedded/service/gitlab-rails/bin/sidekiq-cluster \
       -e <%= node['gitlab']['gitlab_rails']['environment'] %> \

spec/chef/cookbooks/gitlab/recipes/puma_spec.rb

@@ -60,6 +60,8 @@
           expect(content).to match(/chmod 0700 \/run\/gitlab\/puma/)
           expect(content).to match(/chown git \/run\/gitlab\/puma/)
           expect(content).to match(/export prometheus_run_dir=\'\/run\/gitlab\/puma\'/)
+          expect(content).to match(/rubyopt=\"-W:no-experimental\"/)
+          expect(content).to include(%(RUBYOPT="${rubyopt}"))
           expect(content).to match(%r(/opt/gitlab/embedded/bin/bundle exec puma -C /var/opt/gitlab/gitlab-rails/etc/puma.rb))
         }
     end

spec/chef/cookbooks/gitlab/recipes/sidekiq_spec.rb

@@ -23,6 +23,8 @@
           expect(content).to match(/chmod 0700 \/run\/gitlab\/sidekiq/)
           expect(content).to match(/chown git \/run\/gitlab\/sidekiq/)
           expect(content).to match(/export prometheus_run_dir=\'\/run\/gitlab\/sidekiq\'/)
+          expect(content).to match(/rubyopt=\"-W:no-experimental\"/)
+          expect(content).to include(%(RUBYOPT="${rubyopt}"))
           expect(content).to match(%r{bin/sidekiq-cluster})
           expect(content).to match(/-m 20/) # max_concurrency
           expect(content).to match(/--timeout 25/) # shutdown timeout