diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-08 15:10:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-08 15:10:09 +0300 |
commit | ccc2dc45a3e8fab3dfeda097be601b16c5beff13 (patch) | |
tree | 771b0dcce5acb418d8c7e1cd3866b99481bd0907 /spec/bin/sidekiq_cluster_spec.rb | |
parent | e612fbe905cf0eacf7e34dbd72d8be98ce5d4eb7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/bin/sidekiq_cluster_spec.rb')
-rw-r--r-- | spec/bin/sidekiq_cluster_spec.rb | 6 |
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 |