diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2018-07-31 20:18:01 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2018-07-31 20:36:35 +0800 |
commit | 02fd8d95f3ce180846569e600140ba23608dc863 (patch) | |
tree | f9d60d71b00dee7e0afd31b84f6b9c590640bcb6 | |
parent | e9d04585f872121d4b1f96e019946cfa48d2f915 (diff) | |
download | gitlab-ce-ee-7023-triage-in-master.tar.gz |
Copy .triage-policies.yml from gl-triage branch andee-7023-triage-in-master
setup the job to run triaging task. Also update the
documents accordingly.
-rw-r--r-- | .gitlab-ci.yml | 77 | ||||
-rw-r--r-- | .triage-policies.yml | 245 | ||||
-rw-r--r-- | CONTRIBUTING.md | 3 |
3 files changed, 304 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fcf47421b01..ff6f3183df2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,9 @@ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git retry: 1 tags: - gitlab-org + except: + variables: + - $GL_TRIAGE .default-cache: &default-cache key: "ruby-2.4.4-debian-stretch-with-yarn" @@ -28,6 +31,7 @@ variables: NODE_ENV: "test" SIMPLECOV: "true" GIT_DEPTH: "20" + GL_TRIAGE: "true" GIT_SUBMODULE_STRATEGY: "none" GET_SOURCES_ATTEMPTS: "3" KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json @@ -98,16 +102,25 @@ stages: # https://docs.gitlab.com/ce/development/writing_documentation.html#testing .except-docs: &except-docs except: - - /(^docs[\/-].*|.*-docs$)/ + refs: + - /(^docs[\/-].*|.*-docs$)/ + variables: + - $GL_TRIAGE .except-qa: &except-qa except: - - /(^qa[\/-].*|.*-qa$)/ + refs: + - /(^qa[\/-].*|.*-qa$)/ + variables: + - $GL_TRIAGE .except-docs-and-qa: &except-docs-and-qa except: - - /(^docs[\/-].*|.*-docs$)/ - - /(^qa[\/-].*|.*-qa$)/ + refs: + - /(^docs[\/-].*|.*-docs$)/ + - /(^qa[\/-].*|.*-qa$)/ + variables: + - $GL_TRIAGE # Jobs that only need to pull cache .dedicated-no-docs-pull-cache-job: &dedicated-no-docs-pull-cache-job @@ -130,7 +143,6 @@ stages: .single-script-job: &single-script-job image: ruby:2.4-alpine - before_script: [] stage: build cache: {} dependencies: [] @@ -262,6 +274,9 @@ package-and-qa: only: - //@gitlab-org/gitlab-ce - //@gitlab-org/gitlab-ee + except: + variables: + - $GL_TRIAGE # Review docs base .review-docs: &review-docs @@ -385,9 +400,12 @@ flaky-examples-check: only: - branches except: - - master - - /(^docs[\/-].*|.*-docs$)/ - - /(^qa[\/-].*|.*-qa$)/ + refs: + - master + - /(^docs[\/-].*|.*-docs$)/ + - /(^qa[\/-].*|.*-qa$)/ + variables: + - $GL_TRIAGE artifacts: expire_in: 30d paths: @@ -453,6 +471,7 @@ danger-review: - master variables: - $CI_COMMIT_REF_NAME =~ /^ce-to-ee-.*/ + - $GL_TRIAGE script: - git version - danger --fail-on-errors=true @@ -619,11 +638,14 @@ docs lint: downtime_check: <<: *rake-exec except: - - master - - tags - - /^[\d-]+-stable(-ee)?$/ - - /(^docs[\/-].*|.*-docs$)/ - - /(^qa[\/-].*|.*-qa$)/ + refs: + - master + - tags + - /^[\d-]+-stable(-ee)?$/ + - /(^docs[\/-].*|.*-docs$)/ + - /(^qa[\/-].*|.*-qa$)/ + variables: + - $GL_TRIAGE rails5_gemfile_lock_check: <<: *dedicated-no-docs-no-db-pull-cache-job @@ -634,12 +656,15 @@ rails5_gemfile_lock_check: ee_compat_check: <<: *rake-exec except: - - master - - tags - - /[\d-]+-stable(-ee)?/ - - /^security-/ - - branches@gitlab-org/gitlab-ee - - branches@gitlab/gitlab-ee + refs: + - master + - tags + - /[\d-]+-stable(-ee)?/ + - /^security-/ + - branches@gitlab-org/gitlab-ee + - branches@gitlab/gitlab-ee + variables: + - $GL_TRIAGE retry: 0 artifacts: name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}" @@ -880,6 +905,20 @@ pages: - master@gitlab-org/gitlab-ce - master@gitlab-org/gitlab-ee +run:triage: + image: ruby:2.4-alpine + stage: build + cache: {} + dependencies: [] + retry: 2 + before_script: + - gem install gitlab-triage --no-doc + script: + - gitlab-triage --token $API_TOKEN --project-id $CI_PROJECT_PATH + only: + variables: + - $GL_TRIAGE + # Insurance in case a gem needed by one of our releases gets yanked from # rubygems.org in the future. cache gems: diff --git a/.triage-policies.yml b/.triage-policies.yml new file mode 100644 index 00000000000..53fb01d103a --- /dev/null +++ b/.triage-policies.yml @@ -0,0 +1,245 @@ +.common_conditions: + label_exemptions: &label_exemptions + forbidden_labels: + - technical debt + - Accepting Merge Requests + - backstage + - security + - customer + - customer+ + - test + - development guidelines + - schema redesign + - direction + +resource_rules: + issues: + rules: + - name: Mark stale issues with no milestone for closure + conditions: + date: + attribute: updated_at + condition: older_than + interval_type: months + interval: 12 + milestone: + - No Milestone + state: opened + <<: *label_exemptions + actions: + labels: + - awaiting feedback + - auto updated + mention: + - markglenfletcher + comment: | + Hi, + + First of all, thank you for raising an issue to help improve the GitLab product. We're sorry about this, but this particular issue has gone unnoticed for quite some time. To establish order in the GitLab-CE Issue Tracker, we must ensure that every issue is correctly labelled and triaged, to get the proper attention. + + This issue will be closed, as it meets the following criteria: + * No activity in the past 12 months + * No milestone (unscheduled) + + We'd like to ask you to help us out and determine whether this issue should be reopened. + + If this issue is reporting a bug, please can you attempt to reproduce on the latest version of GitLab or GitLab.com, to help us to understand whether the bug still needs our attention. + + If this issue is proposing a new feature, please can you verify whether the feature proposal is still relevant. + + Thanks for your help + - name: Mark stale issues for closure + conditions: + date: + attribute: updated_at + condition: older_than + interval_type: months + interval: 3 + labels: + - No Label + state: opened + actions: + labels: + - awaiting feedback + - auto updated + mention: + - markglenfletcher + comment: | + Hi, + + First of all, thank you for raising an issue to help improve the GitLab product. We're sorry about this, but this particular issue has gone unnoticed for quite some time. To establish order in the GitLab-CE Issue Tracker, we must ensure that every issue is correctly labelled and triaged, to get the proper attention. + + This issue will be closed, as it meets the following criteria: + * No activity in the past 3 months + * Unlabelled + + We'd like to ask you to help us out and determine whether this issue should be reopened. + + If this issue is reporting a bug, please can you attempt to reproduce on the latest version of GitLab or GitLab.com, to help us to understand whether the bug still needs our attention. + + If this issue is proposing a new feature, please can you verify whether the feature proposal is still relevant. + + Thanks for your help + - name: Mark potentially interesting feature proposals + conditions: + labels: + - feature proposal + state: opened + upvotes: + attribute: upvotes + condition: greater_than + threshold: 10 + milestone: + - No Milestone + actions: + labels: + - auto updated + - potential proposal + - name: Mark very popular, unscheduled feature proposals + conditions: + labels: + - feature proposal + state: opened + milestone: + - No Milestone + upvotes: + attribute: upvotes + condition: greater_than + threshold: 50 + actions: + labels: + - auto updated + - popular proposal + - name: Mark stale bugs for closure + conditions: + date: + attribute: updated_at + condition: older_than + interval_type: months + interval: 6 + labels: + - bug + milestone: + - No Milestone + state: opened + <<: *label_exemptions + actions: + labels: + - awaiting feedback + - auto updated + mention: + - markglenfletcher + comment: | + Hi, + + First of all, thank you for raising an issue to help improve the GitLab product. We're sorry about this, but this particular issue has gone unnoticed for quite some time. To establish order in the GitLab-CE Issue Tracker, we must ensure that every issue is correctly labelled and triaged, to get the proper attention. + + This issue will be marked for closure, as it meets the following criteria: + * Issue is open + * No activity in the past 6 months + * Labelled as a bug + * Unscheduled (no milestone) + + We'd like to ask you to help us out and determine whether this issue should be reopened. + + Because this issue is reporting a bug, please can you attempt to reproduce on the latest version of GitLab or on GitLab.com, to help us to understand whether the bug still needs our attention. + + Thanks for your help + - name: Mark stale Support Requests for closure + conditions: + date: + attribute: updated_at + condition: older_than + interval_type: months + interval: 3 + labels: + - support request + milestone: + - No Milestone + state: opened + actions: + labels: + - awaiting feedback + - auto updated + mention: + - markglenfletcher + comment: | + Hi, + + This issue was labelled as a support request. + + This issue will be marked for closure, as it meets the following criteria: + * Issue is open + * No activity in the past 3 months + * Labelled as a support request + * Unscheduled (no milestone) + + We'd like to ask you to help us out and determine whether this issue should remain open. + + Please could you revisit the issue and provide an update if it is still relevant. + + Thanks for your help + merge_requests: + rules: + - name: Encourage old Community Merge Requests to completion + conditions: + date: + attribute: updated_at + condition: older_than + interval_type: months + interval: 6 + labels: + - Community Contribution + state: opened + actions: + labels: + - awaiting feedback + - auto updated + mention: + - rymai + comment: | + Hi, + + First of all, thank you for creating a Merge Request to help improve the GitLab product. We are running through old Merge Requests and asking authors to update their Merge Requests + + This Merge Request was chosen, as it meets the following criteria: + * Open + * Labelled ~"Community Contribution" + * No activity in the past 6 months + + We'd like to ask you to help us out and let us know whether: + * You would like to continue the work here + * You would like us to take on the Merge Request for you + * You would like us to close down the Merge Request + + Thanks for your help + - name: Remind team members to set relevant labels on their MRs + conditions: + author_member: + source: group + condition: member_of + source_id: gitlab-org + labels: + - No Label + state: opened + actions: + labels: + - auto updated + comment: | + Hi, + + Please [add labels to your merge request](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#workflow-labels), this helps triage community merge requests. + + Thanks for your help! :black_heart: + - name: Label community merge requests + conditions: + author_member: + source: group + condition: not_member_of + source_id: gitlab-org + labels: + - No Label + state: opened + actions: + labels: + - Community Contribution diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad8022e972f..cd145b97884 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -377,13 +377,12 @@ on those issues. Please select someone with relevant experience from the the commit history for the affected files to find someone. We also use [GitLab Triage] to automate some triaging policies. This is -currently setup as a [scheduled pipeline] running on the [`gl-triage`] branch. +currently setup as a [scheduled pipeline] running on master. [described in our handbook]: https://about.gitlab.com/handbook/engineering/issue-triage/ [issue bash events]: https://gitlab.com/gitlab-org/gitlab-ce/issues/17815 [GitLab Triage]: https://gitlab.com/gitlab-org/gitlab-triage [scheduled pipeline]: https://gitlab.com/gitlab-org/gitlab-ce/pipeline_schedules/3732/edit -[`gl-triage`]: https://gitlab.com/gitlab-org/gitlab-ce/tree/gl-triage ### Feature proposals |