From a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Jun 2021 18:25:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-0-stable-ee --- spec/bin/sidekiq_cluster_spec.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'spec/bin/sidekiq_cluster_spec.rb') 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 -- cgit v1.2.1