diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /spec/commands/sidekiq_cluster | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'spec/commands/sidekiq_cluster')
-rw-r--r-- | spec/commands/sidekiq_cluster/cli_spec.rb | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/spec/commands/sidekiq_cluster/cli_spec.rb b/spec/commands/sidekiq_cluster/cli_spec.rb index 223d0c3b0ec..55e8ab7885e 100644 --- a/spec/commands/sidekiq_cluster/cli_spec.rb +++ b/spec/commands/sidekiq_cluster/cli_spec.rb @@ -195,22 +195,22 @@ RSpec.describe Gitlab::SidekiqCluster::CLI, stub_settings_source: true do # rubo }, 'high urgency CI queues' => { query: 'feature_category=continuous_integration&urgency=high', - included_queues: %w(pipeline_cache:expire_job_cache pipeline_cache:expire_pipeline_cache), + included_queues: %w(pipeline_default:ci_drop_pipeline), excluded_queues: %w(merge) }, 'CPU-bound high urgency CI queues' => { query: 'feature_category=continuous_integration&urgency=high&resource_boundary=cpu', - included_queues: %w(pipeline_cache:expire_pipeline_cache), - excluded_queues: %w(pipeline_cache:expire_job_cache merge) + included_queues: %w(pipeline_default:ci_create_downstream_pipeline), + excluded_queues: %w(pipeline_default:ci_drop_pipeline merge) }, 'CPU-bound high urgency non-CI queues' => { query: 'feature_category!=continuous_integration&urgency=high&resource_boundary=cpu', included_queues: %w(new_issue), - excluded_queues: %w(pipeline_cache:expire_pipeline_cache) + excluded_queues: %w(pipeline_default:ci_create_downstream_pipeline) }, 'CI and SCM queues' => { query: 'feature_category=continuous_integration|feature_category=source_code_management', - included_queues: %w(pipeline_cache:expire_job_cache merge), + included_queues: %w(pipeline_default:ci_drop_pipeline merge), excluded_queues: %w(mailers) } } @@ -243,10 +243,17 @@ RSpec.describe Gitlab::SidekiqCluster::CLI, stub_settings_source: true do # rubo end it 'expands multiple queue groups correctly' do + expected_workers = + if Gitlab.ee? + [%w[chat_notification], %w[project_export project_template_export]] + else + [%w[chat_notification], %w[project_export]] + end + expect(Gitlab::SidekiqCluster) .to receive(:start) - .with([['chat_notification'], ['project_export']], default_options) - .and_return([]) + .with(expected_workers, default_options) + .and_return([]) cli.run(%w(--queue-selector feature_category=chatops&has_external_dependencies=true resource_boundary=memory&feature_category=importers)) end |