diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-22 12:09:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-22 12:09:15 +0300 |
commit | b014ff26b4416de3aa49d83483d8ce5d273c0708 (patch) | |
tree | bcf94e60e38d43d34b1d230c914ea6ea4fdbe9a3 /.gitlab | |
parent | 073d94594fabc5a3d6148c03c4bd7523d1bb7e15 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 4 | ||||
-rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 17 | ||||
-rw-r--r-- | .gitlab/issue_templates/Query Performance Investigation.md | 11 |
3 files changed, 25 insertions, 7 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 76191a923bf..fefadab16e4 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -161,7 +161,7 @@ review-qa-smoke: review-qa-all: extends: - .review-qa-base - - .review:rules:mr-only-manual + - .review:rules:review-qa-all parallel: 5 script: - export KNAPSACK_REPORT_PATH=knapsack/master_report.json @@ -198,7 +198,7 @@ review-performance: parallel-spec-reports: extends: - - .review:rules:mr-only-manual + - .review:rules:review-qa-all image: ${GITLAB_DEPENDENCY_PROXY}ruby:2.7-alpine stage: post-qa dependencies: ["review-qa-all"] diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index e76b0f2d07f..b8b37c530f2 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1007,9 +1007,12 @@ - <<: *if-dot-com-gitlab-org-merge-request changes: *frontend-patterns - <<: *if-dot-com-gitlab-org-merge-request - changes: *code-qa-patterns + changes: *code-patterns when: manual allow_failure: true + - <<: *if-dot-com-gitlab-org-merge-request + changes: *qa-patterns + allow_failure: true - <<: *if-dot-com-gitlab-org-schedule .review:rules:review-deploy: @@ -1022,9 +1025,12 @@ changes: *frontend-patterns allow_failure: true - <<: *if-dot-com-gitlab-org-merge-request - changes: *code-qa-patterns + changes: *code-patterns when: manual allow_failure: true + - <<: *if-dot-com-gitlab-org-merge-request + changes: *qa-patterns + allow_failure: true - <<: *if-dot-com-gitlab-org-schedule allow_failure: true @@ -1067,14 +1073,17 @@ when: manual allow_failure: true -.review:rules:mr-only-manual: +.review:rules:review-qa-all: rules: - <<: *if-not-ee when: never - <<: *if-dot-com-gitlab-org-merge-request - changes: *code-qa-patterns + changes: *code-patterns when: manual allow_failure: true + - <<: *if-dot-com-gitlab-org-merge-request + changes: *qa-patterns + allow_failure: true .review:rules:review-cleanup: rules: diff --git a/.gitlab/issue_templates/Query Performance Investigation.md b/.gitlab/issue_templates/Query Performance Investigation.md index ddd361e4f2f..354cdb1bfe1 100644 --- a/.gitlab/issue_templates/Query Performance Investigation.md +++ b/.gitlab/issue_templates/Query Performance Investigation.md @@ -10,6 +10,16 @@ As the name implies, the purpose of the template is to detail underperforming qu - [ ] Provide [priority and severity labels](https://about.gitlab.com/handbook/engineering/quality/issue-triage/#availability) - [ ] If this requires immediate attention cc `@gitlab-org/database-team` and reach out in the #g_database slack channel +### SQL Statement + +```sql + +``` + +### Data from Elastic + +Instructions on collecting data from [PostgreSQL slow logs stored in Elasticsearch](https://gitlab.com/gitlab-com/runbooks/-/merge_requests/3361/diffs) + ### Requested Data points Please provide as many of these fields as possible when submitting a query performance report. @@ -20,7 +30,6 @@ Please provide as many of these fields as possible when submitting a query perfo - Database time relative to total database time - Source of calls (Sidekiq, WebAPI, etc) - Query ID -- SQL Statement - Query Plan - Query Example - Total number of calls (relative) |