diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /.gitlab/merge_request_templates | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to '.gitlab/merge_request_templates')
-rw-r--r-- | .gitlab/merge_request_templates/New End To End Test.md | 2 | ||||
-rw-r--r-- | .gitlab/merge_request_templates/Quarantine End to End Test.md | 44 |
2 files changed, 45 insertions, 1 deletions
diff --git a/.gitlab/merge_request_templates/New End To End Test.md b/.gitlab/merge_request_templates/New End To End Test.md index c38c3ce340a..9e6c4049b90 100644 --- a/.gitlab/merge_request_templates/New End To End Test.md +++ b/.gitlab/merge_request_templates/New End To End Test.md @@ -10,7 +10,7 @@ Please link to the respective test case in the testcases project - [ ] Note if the test is intended to run in specific scenarios. If a scenario is new, add a link to the MR that adds the new scenario. - [ ] Follow the end-to-end tests [style guide](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/style_guide.html) and [best practices](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/best_practices.html). - [ ] Use the appropriate [RSpec metadata tag(s)](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/rspec_metadata_tests.html#rspec-metadata-for-end-to-end-tests). -- [ ] Ensure that a created resource is removed after test execution. +- [ ] Ensure that a created resource is removed after test execution. A `Group` resource can be shared between multiple tests. Do not remove it unless it has a unique path. Note that we have a cleanup job that periodically removes groups under `gitlab-qa-sandbox-group`. - [ ] Ensure that no [transient bugs](https://about.gitlab.com/handbook/engineering/quality/issue-triage/#transient-bugs) are hidden accidentally due to the usage of `waits` and `reloads`. - [ ] Verify the tags to ensure it runs on the desired test environments. - [ ] If this MR has a dependency on another MR, such as a GitLab QA MR, specify the order in which the MRs should be merged. diff --git a/.gitlab/merge_request_templates/Quarantine End to End Test.md b/.gitlab/merge_request_templates/Quarantine End to End Test.md new file mode 100644 index 00000000000..5794a62df96 --- /dev/null +++ b/.gitlab/merge_request_templates/Quarantine End to End Test.md @@ -0,0 +1,44 @@ +## What does this MR do? + +<!-- +Please describe why the end-to-end test is being quarantined/ de-quarantined. + +Please note that the aim of quarantining a test is not to get back a green pipeline, but rather to reduce +the noise (due to constantly failing tests, flaky tests, and so on) so that new failures are not missed. +--> + + +### E2E Test Failure issue(s) + +<!-- Please link to the respective E2E test failure issue. --> + + +### Check-list + +- [ ] General code guidelines check-list + - [ ] [Code review guidelines](https://docs.gitlab.com/ee/development/code_review.html) + - [ ] [Style guides](https://docs.gitlab.com/ee/development/contributing/style_guides.html) +- [ ] Quarantine test check-list + - [ ] Follow the [Quarantining Tests guide](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantining-tests). + - [ ] Confirm the test has a [`quarantine:` tag with the specified quarantine type](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantined-test-types). + - [ ] Note if the test should be [quarantined for a specific environment](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/environment_selection.html#quarantining-a-test-for-a-specific-environment). +- [ ] Dequarantine test check-list + - [ ] Follow the [Dequarantining Tests guide](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#dequarantining-tests). + - [ ] Confirm the test consistently passes on the target GitLab environment(s). + - [ ] (Optionally) [Trigger a manual GitLab-QA pipeline](https://about.gitlab.com/handbook/engineering/quality/guidelines/tips-and-tricks/#running-gitlab-qa-pipeline-against-a-specific-gitlab-release) against a specific GitLab environment using the `RELEASE` variable from the `package-and-qa` job of the current merge request. +- [ ] 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. --> +/label ~"Quality" ~"QA" ~"feature" ~"feature::maintenance" + +<!-- Labels to pick into auto-deploy. --> +/label ~"Pick into auto-deploy" ~"priority::1" ~"severity::1" + +<!-- +Choose the stage that appears in the test path, e.g. ~"devops::create" for +`qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb`. +--> +/label ~devops:: + +<!-- Select the current milestone. --> +/milestone % |