Merge branch 'danger-review-pipeline' into 'master'

Add Danger Roulette rules for pipeline files

See merge request gitlab-org/gitlab-ce!32616

4 files changed, 23 insertions, 3 deletions

diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb
index d30d5a38670..17ad07bfc0c 100644
--- a/lib/gitlab/danger/helper.rb
+++ b/lib/gitlab/danger/helper.rb
@@ -83,7 +83,8 @@ module Gitlab
         docs: "~Documentation", # Docs are reviewed along DevOps stages, so don't need roulette for now.
         none: "",
         qa: "~QA",
-        test: "~test for `spec/features/*`"
+        test: "~test for `spec/features/*`",
+        engineering_productivity: "Engineering Productivity for CI config review"
       }.freeze
       CATEGORIES = {
         %r{\Adoc/} => :none, # To reinstate roulette for documentation, set to `:docs`.
@@ -125,7 +126,8 @@ module Gitlab
         %r{\A(ee/)?spec/(?!javascripts|frontend)[^/]+} => :backend,
         %r{\A(ee/)?vendor/(?!assets)[^/]+} => :backend,
         %r{\A(ee/)?vendor/(languages\.yml|licenses\.csv)\z} => :backend,
-        %r{\A(Dangerfile|Gemfile|Gemfile.lock|Procfile|Rakefile|\.gitlab-ci\.yml)\z} => :backend,
+        %r{\A(\.gitlab-ci\.yml\z|\.gitlab\/ci)} => :engineering_productivity,
+        %r{\A(Dangerfile|Gemfile|Gemfile.lock|Procfile|Rakefile)\z} => :backend,
         %r{\A[A-Z_]+_VERSION\z} => :backend,
         %r{\A\.rubocop(_todo)?\.yml\z} => :backend,
 
diff --git a/lib/gitlab/danger/teammate.rb b/lib/gitlab/danger/teammate.rb
index 2789706aa3b..4ad66f61c2b 100644
--- a/lib/gitlab/danger/teammate.rb
+++ b/lib/gitlab/danger/teammate.rb
@@ -42,6 +42,8 @@ module Gitlab
           area = role[/Test Automation Engineer(?:.*?, (\w+))/, 1]
 
           area && labels.any?("devops::#{area.downcase}") if kind == :reviewer
+        when :engineering_productivity
+          role[/Engineering Productivity/] if kind == :reviewer
         else
           capabilities(project).include?("#{kind} #{category}")
         end
diff --git a/spec/lib/gitlab/danger/helper_spec.rb b/spec/lib/gitlab/danger/helper_spec.rb
index 2990594c538..710564b7540 100644
--- a/spec/lib/gitlab/danger/helper_spec.rb
+++ b/spec/lib/gitlab/danger/helper_spec.rb
@@ -168,9 +168,13 @@ describe Gitlab::Danger::Helper do
       'Gemfile.lock'   | :backend
       'Procfile'       | :backend
       'Rakefile'       | :backend
-      '.gitlab-ci.yml' | :backend
       'FOO_VERSION'    | :backend
 
+      '.gitlab-ci.yml'                                        | :engineering_productivity
+      '.gitlab/ci/cng.gitlab-ci.yml'                          | :engineering_productivity
+      '.gitlab/ci/ee-specific-checks.gitlab-ci.yml'           | :engineering_productivity
+      'lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml'   | :backend
+
       'ee/FOO_VERSION' | :unknown
 
       'db/schema.rb'                                              | :database
diff --git a/spec/lib/gitlab/danger/teammate_spec.rb b/spec/lib/gitlab/danger/teammate_spec.rb
index afbc3896a70..ca036390bde 100644
--- a/spec/lib/gitlab/danger/teammate_spec.rb
+++ b/spec/lib/gitlab/danger/teammate_spec.rb
@@ -65,6 +65,18 @@ describe Gitlab::Danger::Teammate do
           expect(subject.reviewer?(project, :test, labels)).to be_falsey
         end
       end
+
+      context 'when role is Backend Engineer, Engineering Productivity' do
+        let(:role) { 'Backend Engineer, Engineering Productivity' }
+
+        it '#reviewer? returns true' do
+          expect(subject.reviewer?(project, :engineering_productivity, labels)).to be_truthy
+        end
+
+        it '#maintainer? returns false' do
+          expect(subject.maintainer?(project, :engineering_productivity, labels)).to be_falsey
+        end
+      end
     end
   end