Download as
Browse Code »

Commit dc1eff9b91343d8b1cb06b05b5f72dcec1cef860

Authored by Job van der Voort
1 parent ba37f840
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

remove redundancy, remove really good joke, add step to release

Showing 1 changed file with 18 additions and 27 deletions   Show diff stats
doc/release/monthly.md
  Diff comments   View file @dc1eff9
1 1 # Monthly Release
2 2 NOTE: This is a guide for GitLab developers. If you are trying to install GitLab see the latest stable [installation guide](install/installation.md) and if you are trying to upgrade, see the [upgrade guides](update).
3 3  
4   -# Release Schedule
5   -
6   -After making the release branch new commits are cherry-picked from master. When the release gets closer we get more selective what is cherry-picked. The days of the month are approximately as follows:
7   -
8   -* 1-7th: Official merge window (see contributing guide).
9   -* 8-14th: Work on bugfixes, sponsored features and GitLab EE.
10   -* 15th: Code freeze
11   -* 18th: Release Candidate 1
12   -* 20st: Optional release candidate 2
13   -* 22nd: Release
14   -* 23nd: Optional patch releases
15   -* 24-end of month: Release GitLab EE and GitLab CI
16   -
17 4 # **15th - Code Freeze & Release Manager**
18 5  
19 6 ### **1. Stop merging in code, except for important bugfixes**
... ... @@ -24,8 +11,6 @@ A release manager is selected that coordinates the entire release of this versio
24 11  
25 12 # **18th - Releasing RC1**
26 13  
27   -> Yo dawg, I heard you like releases..
28   -
29 14 The RC1 release comes with the task to update the installation and upgrade docs. Be mindful that there might already be merge requests for this on GitLab or GitHub.
30 15  
31 16 ### **1. Create an issue for RC1 release**
... ... @@ -118,9 +103,13 @@ Merge the RC1 code into Cloud. Once the build is green, deploy in the morning.
118 103 It is important to do this as soon as possible, so we can catch any errors before we release the full version.
119 104  
120 105  
121   -# **22nd - Release CE**
  106 +# **22nd - Release**
122 107  
123   -After making the release branch new commits are cherry-picked from master. When the release gets closer we get more selective what is cherry-picked. The days of the month are approximately as follows:
  108 +For GitLab EE, append -ee to the branches and tags.
  109 +
  110 +`x-x-stable-ee`
  111 +
  112 +`v.x.x.0-ee`
124 113  
125 114 ### **1. Create x-x-stable branch and push to the repositories**
126 115  
... ... @@ -135,7 +124,8 @@ git push <remote> x-x-stable
135 124 [Follow this guide](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md)
136 125  
137 126 ### **3. QA**
138   -Use the omnibus packages to test the following:
  127 +Use the omnibus packages to test using [this guide](https://dev.gitlab.org/gitlab/gitlab-ee/blob/master/doc/release/manual_testing.md)
  128 +
139 129  
140 130 ### **4. Fix anything coming out of the QA**
141 131  
... ... @@ -153,21 +143,22 @@ git push origin master
153 143  
154 144 Next, merge the VERSION into the x-x-stable branch.
155 145  
156   -### **8. Publish blog for new release**
157   -* Mention what GitLab is on the second line: GitLab is open source software to collaborate on code.
158   -* Select and thank the the Most Valuable Person (MVP) of this release.
159   -* Add a note if there are security fixes: This release fixes an important security issue and we advise everyone to upgrade as soon as possible.
  146 +### **8. Push to remotes**
160 147  
161   -### **9. Tweet to blog**
  148 +For GitLab CE, push to dev, GitLab.com and GitHub.
162 149  
163   -Send out a tweet to share the good news with the world. For a major/minor release, list the features in short and link to the blog post.
  150 +For GitLab EE, push to the subscribers repo.
164 151  
165   -For a RC, make sure to explain what a RC is.
  152 +NOTE: You might not have the rights to push to master on dev. Ask Dmitriy.
166 153  
167   -A patch release tweet should specify the fixes it brings and link to the corresponding blog post.
  154 +### **9. Publish blog for new release**
  155 +* Mention what GitLab is on the second line: GitLab is open source software to collaborate on code.
  156 +* Select and thank the the Most Valuable Person (MVP) of this release.
  157 +* Add a note if there are security fixes: This release fixes an important security issue and we advise everyone to upgrade as soon as possible.
168 158  
  159 +### **10. Tweet to blog**
169 160  
170   -# **22nd - Release EE**
  161 +Send out a tweet to share the good news with the world. List the features in short and link to the blog post.
171 162  
172 163 # **23rd - Optional Patch Release**
173 164  
... ...