diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2020-03-05 20:24:58 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2020-03-05 20:24:58 +0300 |
| commit | 5e6af2c1bd61b21fa44581ac2d11911bc86f16d1 (patch) | |
| tree | 5fd3cc92352cd7850a5e0c990558ff20cf70f54c | |
| parent | e27659e35bfc15ebd71ca4b2c306cd57981c242f (diff) | |
| parent | 0a9e48043665884c6e97d1b5d844b509e13eb1c3 (diff) | |
Merge branch 'fix-security-template' into 'master'
Update security release template
See merge request gitlab-org/gitaly!1886
| -rw-r--r-- | .gitlab/issue_templates/Security Release.md | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/.gitlab/issue_templates/Security Release.md b/.gitlab/issue_templates/Security Release.md index c367dcc89..3788459fd 100644 --- a/.gitlab/issue_templates/Security Release.md +++ b/.gitlab/issue_templates/Security Release.md @@ -57,6 +57,7 @@ As a sanity check, you can verify your repository only points to remotes in ### Only after the security release occurs and the details are made public - **Maintainer**: + - [ ] Check mirroring status with chatops in slack `/chatops run mirror status` - [ ] Ensure master branch on dev.gitlab.com is synced with gitlab.com: 1. `git checkout master` 1. `git remote add gitlab.com git@gitlab.com:gitlab-org/gitaly.git` @@ -78,22 +79,9 @@ As a sanity check, you can verify your repository only points to remotes in 1. `git branch -D gitlab-com-master` 1. `git remote remove gitlab.com` 1. Ensure no origins exist that point to gitlab.com: `git remote -v` - - [ ] Push all the newly released security tags in - `dev.gitlab.org` to the public gitlab.com instance: - 1. `git remote add gitlab.com git@gitlab.com:gitlab-org/gitaly.git` - 1. `git push gitlab.com vX.Y.Z` (repeat for each tag) - 1. `git remote remove gitlab.com` - 1. Ensure no origins exist that point to gitlab.com: `git remote -v` - [ ] There is a good chance the newly patched Gitaly master on `gitlab.com` will need to be used to patch the latest GitLab CE/EE. - This will require running the regular release process on gitlab.com. - - [ ] Merge the stable branches for gitlab.com and dev.gitlab.org - 1. `git remote add gitlab.com git@gitlab.com:gitlab-org/gitaly.git` - 1. `git checkout X-Y-stable` - 1. `git fetch gitlab.com X-Y-stable` - 1. `git merge gitlab.com/X-Y-stable` - 1. `git push gitlab.com X-Y-stable` - 1. `git remote remove gitlab.com` + This will require running the regular release candidate process on gitlab.com. - [ ] Gitaly on GitLab.com uses push mirroring to dev.gitlab.com, if branches are diverged this stops working. Go to `Settings > Repository > Mirroring repositories` to update the mirror. When there's no error after the manual update, it will |