diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/bin/sidekiq_cluster_spec.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/bin/sidekiq_cluster_spec.rb')
-rw-r--r-- | spec/bin/sidekiq_cluster_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/bin/sidekiq_cluster_spec.rb b/spec/bin/sidekiq_cluster_spec.rb index fc5e2ae861a..503cc0999c5 100644 --- a/spec/bin/sidekiq_cluster_spec.rb +++ b/spec/bin/sidekiq_cluster_spec.rb @@ -9,6 +9,8 @@ RSpec.describe 'bin/sidekiq-cluster' do context 'when selecting some queues and excluding others' 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 @@ -29,6 +31,8 @@ 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 *] ].each do |args| it "runs successfully with `#{args}`", :aggregate_failures do |