diff --git a/.github/PULL_REQUEST_TEMPLATE/backport.md b/.github/PULL_REQUEST_TEMPLATE/backport.md index d4c64050ae..3138fa9c8d 100644 --- a/.github/PULL_REQUEST_TEMPLATE/backport.md +++ b/.github/PULL_REQUEST_TEMPLATE/backport.md @@ -8,7 +8,7 @@ This is the PR template for backport PRs against `develop`. ### Author - [ ] Target branch is `develop` -- [ ] Name of source branch matches `backports/<7-digit SHA1 of most recent backported commit>` +- [ ] Name of PR branch matches `backports/<7-digit SHA1 of most recent backported commit>` - [ ] PR title contains the 7-digit SHA1 of the backported commits - [ ] PR title references the issues relating to the backported commits - [ ] PR title references the PRs that introduced the backported commits @@ -21,7 +21,7 @@ This is the PR template for backport PRs against `develop`. - [ ] Added `reqs` label to PR or this PR does not touch requirements*.txt -### Primary reviewer (after rejection) +### Primary reviewer (after requesting changes) Uncheck the *Author (requirements)* and *Author (rebasing, integration test)* checklists. @@ -40,8 +40,10 @@ checklists. - [ ] Sanity-checked history - [ ] Pushed PR branch to GitHub -- [ ] Branch pushed to GitLab and added `sandbox` label or PR is labeled `no sandbox` -- [ ] Build passed in sandbox or PR is labeled `no sandbox` +- [ ] Pushed PR branch to GitLab `dev` and added `sandbox` label or PR is labeled `no sandbox` +- [ ] Build passes in `sandbox` deployment or PR is labeled `no sandbox` +- [ ] Pushed PR branch to GitLab `anvildev` or PR is labeled `no sandbox` +- [ ] Build passes in `anvilbox` deployment or PR is labeled `no sandbox` - [ ] Added PR reference (this PR) to merge commit title - [ ] Collected commit title tags in merge commit title - [ ] Pushed merge commit to GitHub @@ -49,9 +51,13 @@ checklists. ### Operator (after pushing the merge commit) -- [ ] Pushed merge commit to GitLab or PR is labeled `no sandbox` -- [ ] Deleted PR branch from GitHub and GitLab -- [ ] Build passes on GitLab1 +- [ ] Pushed merge commit to GitLab `dev` or PR is labeled `no sandbox` +- [ ] Pushed merge commit to GitLab `anvildev` or PR is labeled `no sandbox` +- [ ] Build passes on GitLab `dev`1 +- [ ] Build passes on GitLab `anvildev`1 +- [ ] Deleted PR branch from GitHub +- [ ] Deleted PR branch from GitLab `dev` +- [ ] Deleted PR branch from GitLab `anvildev` 1 When pushing the merge commit is skipped due to the PR being labelled `no sandbox`, the next build triggered by a PR whose merge commit *is* diff --git a/.github/PULL_REQUEST_TEMPLATE/gitlab.md b/.github/PULL_REQUEST_TEMPLATE/gitlab.md index 334cd0bd77..85a4c0a16e 100644 --- a/.github/PULL_REQUEST_TEMPLATE/gitlab.md +++ b/.github/PULL_REQUEST_TEMPLATE/gitlab.md @@ -11,7 +11,7 @@ Connected issue: #4014 ### Author - [ ] Target branch is `develop` -- [ ] Name of source branch matches `gitlab/yyyy-mm-dd/` +- [ ] Name of PR branch matches `gitlab/yyyy-mm-dd/` - [ ] PR title matches `Update GitLab to (#4014)` - [ ] Disconnected any other PRs currently connected to #4014 via ZenHub - [ ] PR is connected to issue #4014 via ZenHub @@ -20,12 +20,14 @@ Connected issue: #4014 ### Author (deploy) - [ ] Deployed changes to `dev.gitlab` +- [ ] Deployed changes to `anvildev.gitlab` - [ ] Deployed changes to `prod.gitlab` ### Primary reviewer (after approval) - [ ] Verified background migrations for `dev.gitlab` are complete +- [ ] Verified background migrations for `anvildev.gitlab` are complete - [ ] Verified background migrations for `prod.gitlab` are complete - [ ] Actually approved the PR - [ ] Labeled connected issue as `no demo` @@ -37,7 +39,7 @@ Connected issue: #4014 ### Operator (before pushing merge the commit) -- [ ] Rebased and squashed branch +- [ ] Rebased and squashed PR branch - [ ] Sanity-checked history - [ ] Pushed PR branch to GitHub - [ ] Added PR reference to merge commit title diff --git a/.github/PULL_REQUEST_TEMPLATE/hotfix.md b/.github/PULL_REQUEST_TEMPLATE/hotfix.md index 1d1058c27a..58d7d86dc9 100644 --- a/.github/PULL_REQUEST_TEMPLATE/hotfix.md +++ b/.github/PULL_REQUEST_TEMPLATE/hotfix.md @@ -11,7 +11,7 @@ Connected issue: #0000 ### Author - - [ ] Target branch is `prod` -- [ ] Name of source branch matches `hotfixes//-` +- [ ] Name of PR branch matches `hotfixes//-` - [ ] PR title references the connected issue - [ ] PR title is `Hotfix: ` followed by title of connected issue - [ ] PR is connected to issue via Zenhub @@ -35,7 +35,7 @@ Connected issue: #0000 ### Author (before every review) -- [ ] Rebased branch on `prod`, squashed old fixups +- [ ] Rebased PR branch on `prod`, squashed old fixups ### Primary reviewer (after approval) @@ -49,7 +49,7 @@ Connected issue: #0000 ### Operator (before pushing merge the commit) -- [ ] Rebased and squashed branch onto `prod` +- [ ] Rebased and squashed PR branch onto `prod` - [ ] Sanity-checked history - [ ] Pushed PR branch to GitHub - [ ] Added PR reference to merge commit title @@ -61,7 +61,7 @@ Connected issue: #0000 ### Operator (after pushing the merge commit) - [ ] Pushed merge commit to GitLab `prod` -- [ ] Deleted PR branch from GitHub and GitLab +- [ ] Deleted PR branch from GitHub and GitLab `prod` - [ ] Build passes on GitLab diff --git a/.github/PULL_REQUEST_TEMPLATE/promotion.md b/.github/PULL_REQUEST_TEMPLATE/promotion.md index 17709b6e2b..8093cde282 100644 --- a/.github/PULL_REQUEST_TEMPLATE/promotion.md +++ b/.github/PULL_REQUEST_TEMPLATE/promotion.md @@ -11,10 +11,10 @@ Connected issue: #0000 ### Author - [ ] Target branch is `prod` -- [ ] Source branch matches `promotions/yyyy-mm-dd` +- [ ] Name of PR branch matches `promotions/yyyy-mm-dd` - [ ] Title of connected issue matches `Promotion yyyy-mm-dd` -- [ ] PR title starts with title of connected issue - [ ] PR title references the connected issue +- [ ] PR title starts with title of connected issue - [ ] PR is connected to issue via Zenhub - [ ] PR description links to connected issue @@ -31,7 +31,7 @@ Connected issue: #0000 ### Primary reviewer (after approval) - [ ] Actually approved the PR -- [ ] Labeled PR as `no sandbox` +- [ ] Labeled PR `no sandbox` - [ ] Moved ticket to *Approved* column - [ ] Assigned PR to current operator @@ -61,7 +61,7 @@ Connected issue: #0000 - [ ] Deleted unreferenced indices in `prod` or this PR does not remove catalogs or otherwise causes unreferenced indices - [ ] Started reindex in `prod` or this PR does not require reindexing - [ ] Checked for and triaged indexing failures or this PR does not require reindexing -- [ ] Emptied fail queues in target deployment or this PR does not require reindexing +- [ ] Emptied fail queues in `prod` deployment or this PR does not require reindexing ### Operator diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 0331fbc8d3..dcdf3e4409 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -14,13 +14,13 @@ Connected issue: #0000 ### Author - [ ] Target branch is `develop` -- [ ] Name of source branch matches `issues//-` +- [ ] Name of PR branch matches `issues//-` - [ ] PR title references the connected issue - [ ] PR title matches1 title of connected issue or comment in PR explains why they're different - [ ] Title of at least one commit references connected issue - [ ] PR is connected to issue via Zenhub - [ ] PR description links to connected issue -- [ ] Added `partial` label to PR or this PR completely resolves the connected issue +- [ ] Added `partial` label to PR or this PR completely resolves the connected issue 1 when the issue title describes a problem, the PR title is `Fix: ` followed by the issue title @@ -56,7 +56,7 @@ Connected issue: #0000 - [ ] Reverted the temporary hotfix connected to the issue or there is no temporary hotfix for the connected issue on the `prod` branch -### Author (requirements) +### Author (requirements, before every review) - [ ] Ran `make requirements_update` or this PR does not touch requirements*.txt, common.mk, Makefile and Dockerfile - [ ] Added `R` tag to commit title or this PR does not touch requirements*.txt @@ -66,7 +66,7 @@ Connected issue: #0000 ### Author (rebasing, integration test) - [ ] `make integration_test` passes in personal deployment or this PR does not touch functionality that could break the IT -- [ ] Rebased branch on `develop`, squashed old fixups +- [ ] Rebased PR branch on `develop`, squashed old fixups ### Peer reviewer (after requesting changes) @@ -104,14 +104,19 @@ checklists. Update the `N reviews` label. - [ ] Checked `reindex` label and `r` commit title tag - [ ] Checked that demo expectations are clear or connected issue is labeled as `no demo` -- [ ] Rebased and squashed branch +- [ ] Rebased and squashed PR branch - [ ] Sanity-checked history - [ ] Pushed PR branch to GitHub -- [ ] Branch pushed to GitLab and added `sandbox` label or PR is labeled `no sandbox` -- [ ] Build passed in sandbox or PR is labeled `no sandbox` +- [ ] Pushed PR branch to GitLab `dev` and added `sandbox` label or PR is labeled `no sandbox` +- [ ] Build passes in `sandbox` deployment or PR is labeled `no sandbox` - [ ] Deleted unreferenced indices in `sandbox` or this PR does not remove catalogs or otherwise causes unreferenced indices - [ ] Started reindex in `sandbox` or this PR does not require reindexing `sandbox` - [ ] Checked for failures in `sandbox` or this PR does not require reindexing `sandbox` +- [ ] Pushed PR branch to GitLab `anvildev` or PR is labeled `no sandbox` +- [ ] Build passes in `anvilbox` deployment or PR is labeled `no sandbox` +- [ ] Deleted unreferenced indices in `anvilbox` or this PR does not remove catalogs or otherwise causes unreferenced indices +- [ ] Started reindex in `anvilbox` or this PR does not require reindexing `sandbox` +- [ ] Checked for failures in `anvilbox` or this PR does not require reindexing `sandbox` - [ ] Added PR reference to merge commit title - [ ] Collected commit title tags in merge commit title - [ ] Moved connected issue to Merged column @@ -121,9 +126,13 @@ checklists. Update the `N reviews` label. ### Operator (after pushing the merge commit) - [ ] Shortened the PR chain or this PR is not labeled `base` -- [ ] Pushed merge commit to GitLab or PR is labeled `no sandbox` -- [ ] Deleted PR branch from GitHub and GitLab -- [ ] Build passes on GitLab1 +- [ ] Pushed merge commit to GitLab `dev` or PR is labeled `no sandbox` +- [ ] Pushed merge commit to GitLab `anvildev` or PR is labeled `no sandbox` +- [ ] Build passes on GitLab `dev`1 +- [ ] Build passes on GitLab `anvildev`1 +- [ ] Deleted PR branch from GitHub +- [ ] Deleted PR branch from GitLab `dev` +- [ ] Deleted PR branch from GitLab `anvildev` 1 When pushing the merge commit is skipped due to the PR being labelled `no sandbox`, the next build triggered by a PR whose merge commit *is* @@ -133,9 +142,13 @@ pushed determines this checklist item. ### Operator (reindex) - [ ] Deleted unreferenced indices in `dev` or this PR does not remove catalogs or otherwise causes unreferenced indices +- [ ] Deleted unreferenced indices in `anvildev` or this PR does not remove catalogs or otherwise causes unreferenced indices - [ ] Started reindex in `dev` or this PR does not require reindexing -- [ ] Checked for and triaged indexing failures or this PR does not require reindexing -- [ ] Emptied fail queues in target deployment or this PR does not require reindexing +- [ ] Started reindex in `anvildev` or this PR does not require reindexing +- [ ] Checked for and triaged indexing failures in `dev` or this PR does not require reindexing +- [ ] Checked for and triaged indexing failures in `anvildev` or this PR does not require reindexing +- [ ] Emptied fail queues in `dev` deployment or this PR does not require reindexing +- [ ] Emptied fail queues in `anvildev` deployment or this PR does not require reindexing ### Operator