From 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 19 May 2021 15:44:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-12-stable-ee --- app/workers/jira_connect/sync_branch_worker.rb | 2 ++ app/workers/jira_connect/sync_builds_worker.rb | 3 +++ app/workers/jira_connect/sync_deployments_worker.rb | 3 +++ app/workers/jira_connect/sync_feature_flags_worker.rb | 3 +++ app/workers/jira_connect/sync_merge_request_worker.rb | 2 ++ app/workers/jira_connect/sync_project_worker.rb | 3 +++ 6 files changed, 16 insertions(+) (limited to 'app/workers/jira_connect') diff --git a/app/workers/jira_connect/sync_branch_worker.rb b/app/workers/jira_connect/sync_branch_worker.rb index 1af51c4bb74..b8211286d1c 100644 --- a/app/workers/jira_connect/sync_branch_worker.rb +++ b/app/workers/jira_connect/sync_branch_worker.rb @@ -4,6 +4,8 @@ module JiraConnect class SyncBranchWorker # rubocop:disable Scalability/IdempotentWorker include ApplicationWorker + sidekiq_options retry: 3 + queue_namespace :jira_connect feature_category :integrations loggable_arguments 1, 2 diff --git a/app/workers/jira_connect/sync_builds_worker.rb b/app/workers/jira_connect/sync_builds_worker.rb index 9cb5d5d247d..11a3b598035 100644 --- a/app/workers/jira_connect/sync_builds_worker.rb +++ b/app/workers/jira_connect/sync_builds_worker.rb @@ -4,11 +4,14 @@ module JiraConnect class SyncBuildsWorker include ApplicationWorker + sidekiq_options retry: 3 + idempotent! worker_has_external_dependencies! queue_namespace :jira_connect feature_category :integrations + tags :exclude_from_kubernetes def perform(pipeline_id, sequence_id) pipeline = Ci::Pipeline.find_by_id(pipeline_id) diff --git a/app/workers/jira_connect/sync_deployments_worker.rb b/app/workers/jira_connect/sync_deployments_worker.rb index 7272d35f4cb..9f75b1161f0 100644 --- a/app/workers/jira_connect/sync_deployments_worker.rb +++ b/app/workers/jira_connect/sync_deployments_worker.rb @@ -4,11 +4,14 @@ module JiraConnect class SyncDeploymentsWorker include ApplicationWorker + sidekiq_options retry: 3 + idempotent! worker_has_external_dependencies! queue_namespace :jira_connect feature_category :integrations + tags :exclude_from_kubernetes def perform(deployment_id, sequence_id) deployment = Deployment.find_by_id(deployment_id) diff --git a/app/workers/jira_connect/sync_feature_flags_worker.rb b/app/workers/jira_connect/sync_feature_flags_worker.rb index 496b9f1626d..0d8d3d3142e 100644 --- a/app/workers/jira_connect/sync_feature_flags_worker.rb +++ b/app/workers/jira_connect/sync_feature_flags_worker.rb @@ -4,11 +4,14 @@ module JiraConnect class SyncFeatureFlagsWorker include ApplicationWorker + sidekiq_options retry: 3 + idempotent! worker_has_external_dependencies! queue_namespace :jira_connect feature_category :integrations + tags :exclude_from_kubernetes def perform(feature_flag_id, sequence_id) feature_flag = ::Operations::FeatureFlag.find_by_id(feature_flag_id) diff --git a/app/workers/jira_connect/sync_merge_request_worker.rb b/app/workers/jira_connect/sync_merge_request_worker.rb index 543d8e002fe..6b3a6ae84ad 100644 --- a/app/workers/jira_connect/sync_merge_request_worker.rb +++ b/app/workers/jira_connect/sync_merge_request_worker.rb @@ -4,6 +4,8 @@ module JiraConnect class SyncMergeRequestWorker # rubocop:disable Scalability/IdempotentWorker include ApplicationWorker + sidekiq_options retry: 3 + queue_namespace :jira_connect feature_category :integrations idempotent! diff --git a/app/workers/jira_connect/sync_project_worker.rb b/app/workers/jira_connect/sync_project_worker.rb index 4d52705f207..dfff0c4b3b6 100644 --- a/app/workers/jira_connect/sync_project_worker.rb +++ b/app/workers/jira_connect/sync_project_worker.rb @@ -4,8 +4,11 @@ module JiraConnect class SyncProjectWorker include ApplicationWorker + sidekiq_options retry: 3 + queue_namespace :jira_connect feature_category :integrations + tags :exclude_from_kubernetes idempotent! worker_has_external_dependencies! -- cgit v1.2.1