diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /danger/roulette | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'danger/roulette')
-rw-r--r-- | danger/roulette/Dangerfile | 76 |
1 files changed, 16 insertions, 60 deletions
diff --git a/danger/roulette/Dangerfile b/danger/roulette/Dangerfile index d73f6bf4f10..54559af4066 100644 --- a/danger/roulette/Dangerfile +++ b/danger/roulette/Dangerfile @@ -36,36 +36,22 @@ Please consider creating a merge request to for them. MARKDOWN -NO_REVIEWER = 'No reviewer available'.freeze -NO_MAINTAINER = 'No maintainer available'.freeze +OPTIONAL_REVIEW_TEMPLATE = "%{role} review is optional for %{category}".freeze +NOT_AVAILABLE_TEMPLATE = 'No %{role} available'.freeze -Spin = Struct.new(:reviewer, :maintainer) - -def spin_role_for_category(team, role, project, category) - team.select do |member| - member.public_send("#{role}?", project, category, gitlab.mr_labels) # rubocop:disable GitlabSecurity/PublicSend +def note_for_category_role(spin, role) + if spin.optional_role == role + return OPTIONAL_REVIEW_TEMPLATE % { role: role.capitalize, category: helper.label_for_category(spin.category) } end -end - -def spin_for_category(team, project, category, branch_name) - reviewers, traintainers, maintainers = - %i[reviewer traintainer maintainer].map do |role| - spin_role_for_category(team, role, project, category) - end - # TODO: take CODEOWNERS into account? - # https://gitlab.com/gitlab-org/gitlab/issues/26723 - - # Make traintainers have triple the chance to be picked as a reviewer - random = roulette.new_random(branch_name) - reviewer = roulette.spin_for_person(reviewers + traintainers + traintainers, random: random) - maintainer = roulette.spin_for_person(maintainers, random: random) - - Spin.new(reviewer, maintainer) + spin.public_send(role)&.markdown_name || NOT_AVAILABLE_TEMPLATE % { role: role } # rubocop:disable GitlabSecurity/PublicSend end -def markdown_row_for_category(category, reviewer, maintainer) - "| #{helper.label_for_category(category)} | #{reviewer&.markdown_name || NO_REVIEWER} | #{maintainer&.markdown_name || NO_MAINTAINER} |" +def markdown_row_for_spin(spin) + reviewer_note = note_for_category_role(spin, :reviewer) + maintainer_note = note_for_category_role(spin, :maintainer) + + "| #{helper.label_for_category(spin.category)} | #{reviewer_note} | #{maintainer_note} |" end changes = helper.changes_by_category @@ -78,43 +64,13 @@ categories = changes.keys - [:unknown] categories << :database if gitlab.mr_labels.include?('database') && !categories.include?(:database) if changes.any? - # Strip leading and trailing CE/EE markers - canonical_branch_name = - roulette.canonical_branch_name(gitlab.mr_json['source_branch']) - - team = - begin - roulette.project_team(helper.project_name) - rescue => err - warn("Reviewer roulette failed to load team data: #{err.message}") - [] - end - project = helper.project_name - unknown = changes.fetch(:unknown, []) - spin_per_category = categories.each_with_object({}) do |category, memo| - memo[category] = spin_for_category(team, project, category, canonical_branch_name) - end + branch_name = gitlab.mr_json['source_branch'] - rows = spin_per_category.map do |category, spin| - reviewer = spin.reviewer - maintainer = spin.maintainer - - case category - when :test - if reviewer.nil? - # Fetch an already picked backend reviewer, or pick one otherwise - reviewer = spin_per_category[:backend]&.reviewer || spin_for_category(team, project, :backend, canonical_branch_name).reviewer - end - when :engineering_productivity - if maintainer.nil? - # Fetch an already picked backend maintainer, or pick one otherwise - maintainer = spin_per_category[:backend]&.maintainer || spin_for_category(team, project, :backend, canonical_branch_name).maintainer - end - end - - markdown_row_for_category(category, reviewer, maintainer) - end + roulette_spins = roulette.spin(project, categories, branch_name) + rows = roulette_spins.map { |spin| markdown_row_for_spin(spin) } + + unknown = changes.fetch(:unknown, []) markdown(MESSAGE) markdown(CATEGORY_TABLE_HEADER + rows.join("\n")) unless rows.empty? |