Removes dev client from security tasks

Omnibus is currently moving its security development to GitLab Security,
so it won't be longer necessary to validate and merge MR on
dev.gitlab.org.

Also modifies the projects_to_verify to return only GitLab Security and
Omnibus GitLab Security

Related to gitlab-com/gl-infra/delivery#692

lib/release_tools/security/merge_requests_validator.rb

@@ -6,6 +6,11 @@ module ReleaseTools
     class MergeRequestsValidator
       include ::SemanticLogger::Loggable
 
+      PROJECTS_TO_VERIFY = %w[
+        gitlab-org/security/gitlab
+        gitlab-org/security/omnibus-gitlab
+      ].freeze
+
       ERROR_FOOTNOTE = <<~FOOTNOTE.strip
         <hr>
 
@@ -57,7 +62,7 @@ module ReleaseTools
         valid = []
         invalid = []
 
-        projects_to_verify.each do |project|
+        PROJECTS_TO_VERIFY.each do |project|
           logger.info('Verifying security MRs', project: project)
 
           merge_requests = @client.open_security_merge_requests(project)
@@ -123,24 +128,6 @@ module ReleaseTools
 
         @client.update_merge_request(project_id, iid, assignee_id: mr.author.id)
       end
-
-      private
-
-      def projects_to_verify
-        if @client.security_remote?
-          %w[
-            gitlab-org/security/gitlab
-          ]
-        else
-          %w[
-            gitlab/gitlabhq
-            gitlab/gitlab-ee
-            gitlab/gitaly
-            gitlab/gitlab-workhorse
-            gitlab/omnibus-gitlab
-          ]
-        end
-      end
     end
   end
 end

lib/tasks/security.rake

@@ -26,10 +26,6 @@ namespace :security do
       ReleaseTools::Security::Mirrors.disable
     end
 
-    ReleaseTools::Security::MergeRequestsMerger
-      .new(ReleaseTools::Security::DevClient.new, merge_master: merge_master)
-      .execute
-
     ReleaseTools::Security::MergeRequestsMerger
       .new(ReleaseTools::Security::Client.new, merge_master: merge_master)
       .execute
@@ -78,10 +74,6 @@ namespace :security do
 
   desc 'Validates security merge requests'
   task validate: :force_security do
-    ReleaseTools::Security::MergeRequestsValidator
-      .new(ReleaseTools::Security::DevClient.new)
-      .execute
-
     ReleaseTools::Security::MergeRequestsValidator
       .new(ReleaseTools::Security::Client.new)
       .execute

spec/lib/release_tools/security/merge_requests_validator_spec.rb

@@ -11,22 +11,14 @@ describe ReleaseTools::Security::MergeRequestsValidator do
       merge_request1 = double(:merge_request, web_url: 'example.com')
       merge_request2 = double(:merge_request, web_url: 'example.com')
 
-      allow(client)
-        .to receive(:security_remote?)
-        .and_return(false)
-
-      allow(client)
-        .to receive(:open_security_merge_requests)
-        .and_return(nil)
-
       allow(client)
         .to receive(:open_security_merge_requests)
-        .with('gitlab/gitlabhq')
+        .with('gitlab-org/security/gitlab')
         .and_return([merge_request1])
 
       allow(client)
         .to receive(:open_security_merge_requests)
-        .with('gitlab/gitlab-ee')
+        .with('gitlab-org/security/omnibus-gitlab')
         .and_return([merge_request2])
 
       allow(validator)