Commit 06e5e48e authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '340092-required-type-label-tooling-changes' into 'master'

Resolve "Required type label tooling changes"

See merge request gitlab-org/gitlab!71316
parents d850bb85 e791412a
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
<!-- Describe the audit event you are proposing should be added, including any details of what should be captured, how, and why. --> <!-- Describe the audit event you are proposing should be added, including any details of what should be captured, how, and why. -->
/label ~"Category:Audit Events" /label ~"Category:Audit Events"
/label ~"feature" /label ~"type::feature"
/label ~"group::compliance" /label ~"group::compliance"
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
Please read this! Please read this!
Before opening a new issue, make sure to search for keywords in the issues Before opening a new issue, make sure to search for keywords in the issues
filtered by the "regression" or "bug" label: filtered by the "regression" or "type::bug" label:
- https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=regression - https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=regression
- https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=bug - https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=type::bug
and verify the issue you're about to submit isn't a duplicate. and verify the issue you're about to submit isn't a duplicate.
---> --->
...@@ -82,4 +82,4 @@ will also determine whether the bug is fixed in a more recent version. --> ...@@ -82,4 +82,4 @@ will also determine whether the bug is fixed in a more recent version. -->
<!-- If you can, link to the line of code that might be responsible for the problem. --> <!-- If you can, link to the line of code that might be responsible for the problem. -->
/label ~bug /label ~"type::bug"
...@@ -17,4 +17,4 @@ The changes need to become an official part of the product. ...@@ -17,4 +17,4 @@ The changes need to become an official part of the product.
- [ ] After the flag removal is deployed, [clean up the feature/experiment feature flags](https://docs.gitlab.com/ee/development/feature_flags/controls.html#cleaning-up) by running chatops command in `#production` channel - [ ] After the flag removal is deployed, [clean up the feature/experiment feature flags](https://docs.gitlab.com/ee/development/feature_flags/controls.html#cleaning-up) by running chatops command in `#production` channel
- [ ] Ensure the corresponding [Experiment Tracking](https://gitlab.com/groups/gitlab-org/-/boards/1352542?label_name[]=devops%3A%3Agrowth&label_name[]=growth%20experiment&label_name[]=experiment%20tracking) issue is updated - [ ] Ensure the corresponding [Experiment Tracking](https://gitlab.com/groups/gitlab-org/-/boards/1352542?label_name[]=devops%3A%3Agrowth&label_name[]=growth%20experiment&label_name[]=experiment%20tracking) issue is updated
/label ~"feature" ~"feature::maintenance" ~"workflow::scheduling" ~"growth experiment" ~"feature flag" /label ~"type::maintenance" ~"workflow::scheduling" ~"growth experiment" ~"feature flag"
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
<!-- Consider adding related issues and epics to this issue. You can also reference the Feature Proposal Template (https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/issue_templates/Feature%20proposal%20-%20detailed.md) for additional details to consider adding to this issue. Additionally, as a data oriented organization, when your feature exits planning breakdown, consider adding the `What does success look like, and how can we measure that?` section. <!-- Consider adding related issues and epics to this issue. You can also reference the Feature Proposal Template (https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/issue_templates/Feature%20proposal%20-%20detailed.md) for additional details to consider adding to this issue. Additionally, as a data oriented organization, when your feature exits planning breakdown, consider adding the `What does success look like, and how can we measure that?` section.
--> -->
/label ~feature::addition ~"group::" ~"section::" ~"Category:" ~"GitLab Core"/~"GitLab Premium"/~"GitLab Ultimate" /label ~"type::feature" ~feature::addition ~"group::" ~"section::" ~"Category:" ~"GitLab Core"/~"GitLab Premium"/~"GitLab Ultimate"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
/label ~"feature" ~"group::" ~"section::" ~"Category::" ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate" /label ~"type::feature" ~"group::" ~"section::" ~"Category::" ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate"
<!--- Use the following resources to find the appropriate labels: <!--- Use the following resources to find the appropriate labels:
......
...@@ -112,6 +112,4 @@ Use the following resources to find the appropriate labels: ...@@ -112,6 +112,4 @@ Use the following resources to find the appropriate labels:
--> -->
/label ~devops:: ~group: ~Category: /label ~devops:: ~group: ~Category:
/label ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate" /label ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate"
/label ~feature /label ~"type::feature" ~documentation ~direction
/label ~documentation
/label ~direction
...@@ -53,4 +53,4 @@ See also: ...@@ -53,4 +53,4 @@ See also:
--> -->
/label ~"infradev" /label ~"infradev"
/label ~"bug" /label ~"type::bug"
...@@ -41,9 +41,9 @@ please list them here. ...@@ -41,9 +41,9 @@ please list them here.
<!-- <!--
Please select the appropriate label from the following: Please select the appropriate label from the following:
~"feature::addition" ~"feature::addition"
~"feature::maintenance" ~"type::maintenance"
~"tooling::pipelines" ~"tooling::pipelines"
~"tooling::workflow" ~"tooling::workflow"
--> -->
/label ~"feature::maintenance" /label ~"type::maintenance"
...@@ -29,5 +29,5 @@ ...@@ -29,5 +29,5 @@
### Team ### Team
- [ ] Add ~"workflow::planning breakdown" ~feature and the corresponding `~devops::<stage>` and `~group::<group>` labels. - [ ] Add ~"workflow::planning breakdown" ~"type::feature" and the corresponding `~devops::<stage>` and `~group::<group>` labels.
- [ ] Ping the PM and EM. - [ ] Ping the PM and EM.
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
If you are only adding documentation, do not add any of the following labels: If you are only adding documentation, do not add any of the following labels:
- `~"feature"` - `~"type::feature"`
- `~"frontend"` - `~"frontend"`
- `~"backend"` - `~"backend"`
- `~"bug"` - `~"type::bug"`
- `~"database"` - `~"database"`
These labels cause the MR to be added to code verification QA issues. These labels cause the MR to be added to code verification QA issues.
......
...@@ -24,5 +24,5 @@ Please link to the respective test case in the testcases project ...@@ -24,5 +24,5 @@ Please link to the respective test case in the testcases project
/label ~"Quality:test-gap" ~"Quality:EE test gaps" /label ~"Quality:test-gap" ~"Quality:EE test gaps"
<!-- Select the appropriate feature label, ~"feature::addition" for tests added for new features, ~"feature::maintenance" for tests added for existing features --> <!-- Select the appropriate feature label, ~"feature::addition" for tests added for new features, ~"type::maintenance" for tests added for existing features -->
/label ~"feature::addition" ~"feature::maintenance" /label ~"feature::addition" ~"type::maintenance"
...@@ -35,4 +35,4 @@ This will help keep track of expected cost increases to the [GitLab project aver ...@@ -35,4 +35,4 @@ This will help keep track of expected cost increases to the [GitLab project aver
- [ ] Consider communicating these changes to the broader team following the [communication guideline for pipeline changes](https://about.gitlab.com/handbook/engineering/quality/engineering-productivity/#pipeline-changes) - [ ] Consider communicating these changes to the broader team following the [communication guideline for pipeline changes](https://about.gitlab.com/handbook/engineering/quality/engineering-productivity/#pipeline-changes)
/label ~tooling ~"tooling::pipelines" ~"Engineering Productivity" /label ~"type::tooling" ~"tooling::pipelines" ~"Engineering Productivity"
...@@ -30,7 +30,7 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new ...@@ -30,7 +30,7 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new
- [ ] To ensure a faster turnaround, ask in the `#quality` Slack channel for someone to review and merge the merge request, rather than assigning it directly. - [ ] To ensure a faster turnaround, ask in the `#quality` Slack channel for someone to review and merge the merge request, rather than assigning it directly.
<!-- Base labels. --> <!-- Base labels. -->
/label ~"Quality" ~"QA" ~"feature" ~"feature::maintenance" /label ~"Quality" ~"QA" ~"type::maintenance"
<!-- <!--
Choose the stage that appears in the test path, e.g. ~"devops::create" for Choose the stage that appears in the test path, e.g. ~"devops::create" for
......
...@@ -4,24 +4,21 @@ ...@@ -4,24 +4,21 @@
DEFAULT_BRANCH = 'master' DEFAULT_BRANCH = 'master'
THROUGHPUT_LABELS = [ TYPE_LABELS = [
'Community contribution', 'type::feature',
'security',
'bug',
'feature',
'feature::addition', 'feature::addition',
'feature::maintenance', 'type::maintenance',
'tooling', 'type::tooling',
'tooling::pipelines', 'tooling::pipelines',
'tooling::workflow', 'tooling::workflow',
'documentation' 'type::bug'
].freeze ].freeze
if gitlab.mr_body.size < 5 if gitlab.mr_body.size < 5
fail "Please provide a proper merge request description." fail "Please provide a proper merge request description."
end end
if (THROUGHPUT_LABELS & gitlab.mr_labels).empty? if (TYPE_LABELS & gitlab.mr_labels).empty?
warn 'Please add a [merge request type](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification) to this merge request.' warn 'Please add a [merge request type](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification) to this merge request.'
end end
......
...@@ -8,7 +8,7 @@ SPECIALIZATIONS = { ...@@ -8,7 +8,7 @@ SPECIALIZATIONS = {
frontend: 'frontend', frontend: 'frontend',
docs: 'documentation', docs: 'documentation',
qa: 'QA', qa: 'QA',
tooling: 'tooling', tooling: 'type::tooling',
ci_template: 'ci::templates', ci_template: 'ci::templates',
feature_flag: 'feature flag' feature_flag: 'feature flag'
}.freeze }.freeze
......
# frozen_string_literal: true # frozen_string_literal: true
NO_SPECS_LABELS = [ NO_SPECS_LABELS = [
'tooling', 'type::tooling',
'tooling::pipelines', 'tooling::pipelines',
'tooling::workflow', 'tooling::workflow',
'documentation', 'documentation',
......
...@@ -228,7 +228,7 @@ RSpec.describe Tooling::Danger::Changelog do ...@@ -228,7 +228,7 @@ RSpec.describe Tooling::Danger::Changelog do
end end
context 'with changelog label' do context 'with changelog label' do
let(:mr_labels) { ['feature'] } let(:mr_labels) { ['type::feature'] }
it 'is truthy' do it 'is truthy' do
is_expected.to be_truthy is_expected.to be_truthy
...@@ -236,7 +236,7 @@ RSpec.describe Tooling::Danger::Changelog do ...@@ -236,7 +236,7 @@ RSpec.describe Tooling::Danger::Changelog do
end end
context 'with no changelog label' do context 'with no changelog label' do
let(:mr_labels) { ['tooling'] } let(:mr_labels) { ['type::tooling'] }
it 'is truthy' do it 'is truthy' do
is_expected.to be_falsey is_expected.to be_falsey
......
...@@ -6,7 +6,7 @@ module Tooling ...@@ -6,7 +6,7 @@ module Tooling
module Danger module Danger
module Changelog module Changelog
NO_CHANGELOG_LABELS = [ NO_CHANGELOG_LABELS = [
'tooling', 'type::tooling',
'tooling::pipelines', 'tooling::pipelines',
'tooling::workflow', 'tooling::workflow',
'ci-build', 'ci-build',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment