Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 1 insertions, 5 deletions

diff --git a/spec/bin/sidekiq_cluster_spec.rb b/spec/bin/sidekiq_cluster_spec.rb
index 503cc0999c5..1bba048a27c 100644
--- a/spec/bin/sidekiq_cluster_spec.rb
+++ b/spec/bin/sidekiq_cluster_spec.rb
@@ -10,8 +10,6 @@ RSpec.describe 'bin/sidekiq-cluster' do
     where(:args, :included, :excluded) do
       %w[--negate cronjob] | '-qdefault,1' | '-qcronjob,1'
       %w[--queue-selector resource_boundary=cpu] | '-qupdate_merge_requests,1' | '-qdefault,1'
-      # Remove with https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/646
-      %w[--experimental-queue-selector resource_boundary=cpu] | '-qupdate_merge_requests,1' | '-qdefault,1'
     end
 
     with_them do
@@ -31,9 +29,7 @@ RSpec.describe 'bin/sidekiq-cluster' do
   context 'when selecting all queues' do
     [
       %w[*],
-      %w[--queue-selector *],
-      # Remove with https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/646
-      %w[--experimental-queue-selector *]
+      %w[--queue-selector *]
     ].each do |args|
       it "runs successfully with `#{args}`", :aggregate_failures do
         cmd = %w[bin/sidekiq-cluster --dryrun] + args