From b0e15a6a6f46f3c13e93e79d15e50e9324186491 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chrisjwilson.com>
Date: Tue, 14 Feb 2017 11:58:27 -0600
Subject: [PATCH] Move RepositoryUpdateRemoteMirrorWorker jobs to
 project_mirror Sidekiq queue

We moved RepositoryUpdateMirrorWorker to the project_mirror queue in
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/900

RepositoryUpdateMirrorWorker should also exist in the project_mirror
queue and retry should be false.
---
 app/workers/repository_update_remote_mirror_worker.rb         | 2 +-
 changelogs/unreleased-ee/mrchrisw-move-remoteupdateworker.yml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased-ee/mrchrisw-move-remoteupdateworker.yml

diff --git a/app/workers/repository_update_remote_mirror_worker.rb b/app/workers/repository_update_remote_mirror_worker.rb
index fdcae2895ef2f..d20ca32f0a0d7 100644
--- a/app/workers/repository_update_remote_mirror_worker.rb
+++ b/app/workers/repository_update_remote_mirror_worker.rb
@@ -4,7 +4,7 @@ class UpdateRemoteMirrorError < StandardError; end
   include Sidekiq::Worker
   include Gitlab::ShellAdapter
 
-  sidekiq_options queue: :gitlab_shell
+  sidekiq_options queue: :project_mirror, retry: false
 
   def perform(remote_mirror_id)
     begin
diff --git a/changelogs/unreleased-ee/mrchrisw-move-remoteupdateworker.yml b/changelogs/unreleased-ee/mrchrisw-move-remoteupdateworker.yml
new file mode 100644
index 0000000000000..2ae0129b722b1
--- /dev/null
+++ b/changelogs/unreleased-ee/mrchrisw-move-remoteupdateworker.yml
@@ -0,0 +1,4 @@
+---
+title: Move RepositoryUpdateRemoteMirrorWorker jobs to project_mirror Sidekiq queue
+merge_request: 1234
+author:
-- 
GitLab