Download as
Browse Code »

Commit 0957f341b173c95c48906d7545531042cfd39641

Authored by Marin Jankovski
1 parent 971dc479
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Updates for the monthly release document.

Showing 1 changed file with 51 additions and 18 deletions   Show diff stats
doc/release/monthly.md
  Diff comments   View file @0957f34
@@ -100,12 +100,34 @@ Tweet about the RC release: @@ -100,12 +100,34 @@ Tweet about the RC release:
100 100
101 > GitLab x.x.x.rc1 is out. This is a release candidate intended for testing only. Please let us know if you find regressions. 101 > GitLab x.x.x.rc1 is out. This is a release candidate intended for testing only. Please let us know if you find regressions.
102 102
103 -### **8. Update Cloud** 103 +### **8. Update gitlab.com**
104 104
105 -Merge the RC1 code into Cloud. Once the build is green, deploy in the morning. 105 +Merge the RC1 code into gitlab.com. Once the build is green, deploy in the morning.
106 106
107 It is important to do this as soon as possible, so we can catch any errors before we release the full version. 107 It is important to do this as soon as possible, so we can catch any errors before we release the full version.
108 108
  109 +# **21st - Preparation **
  110 +
  111 +### **1. Prepare the blog post**
  112 +
  113 +* Check the changelog of CE and EE for important changes. Based on [release blog template](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/doc/release_blog_template.md) fill in the important information.
  114 +* Create a WIP MR for the blog post and cc the team so everyone can give feedback.
  115 +* Ask Dmitriy to add screenshots to the WIP MR.
  116 +* Decide with team who will be the MVP user.
  117 +* 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.
  118 +
  119 +### **2. Q&A**
  120 +
  121 +Create issue on dev.gitlab.org gitlab repository, named "GitLab X.X release" in order to keep track of the progress.
  122 +
  123 +Use the omnibus packages or cookbook to test using [this guide](https://dev.gitlab.org/gitlab/gitlab-ee/blob/master/doc/release/manual_testing.md).
  124 +
  125 +**NOTE** Upgrader can only be tested when tags are pushed to all repositories. Do not forget to confirm it is working before releasing. Note that in the issue.
  126 +
  127 +
  128 +### **3. Fix anything coming out of the QA**
  129 +
  130 +Create an issue with description of a problem, if it is quick fix fix yourself otherwise contact the team for advice.
109 131
110 # **22nd - Release CE and EE** 132 # **22nd - Release CE and EE**
111 133
@@ -127,27 +149,31 @@ git push <remote> x-x-stable @@ -127,27 +149,31 @@ git push <remote> x-x-stable
127 ### **2. Build the Omnibus packages** 149 ### **2. Build the Omnibus packages**
128 [Follow this guide](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md) 150 [Follow this guide](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md)
129 151
130 -### **3. QA**  
131 -Use the omnibus packages to test using [this guide](https://dev.gitlab.org/gitlab/gitlab-ee/blob/master/doc/release/manual_testing.md) 152 +### **3. Set VERSION to x.x.x and push**
132 153
  154 +Change the VERSION file in `master` branch of the CE repository and commit.
  155 +Cherry-pick into the `x-x-stable` branch of CE.
133 156
134 -### **4. Fix anything coming out of the QA** 157 +Change the VERSION file in `master branch of the EE repository and commit.
  158 +Cherry-pick into the `x-x-stable-ee` branch of EE.
135 159
136 -### **5. Set VERSION to x.x.0** 160 +### **4. Create annotated tag vx.x.x**
  161 +
  162 +In `x-x-stable` branch check for the sha1 of the commit with VERSION file changed. Tag that commit,
137 163
138 -### **6. Create annotated tag vx.x.0**  
139 ``` 164 ```
140 -git tag -a vx.x.0 -m 'Version x.x.0' 165 +git tag -a vx.x.0 -m 'Version x.x.0' xxxxx
141 ``` 166 ```
142 167
143 -### **7. Push VERSION + Tag to master, merge into x-x-stable** 168 +where `xxxxx` is sha1.
  169 +
  170 +### **5. Push the tag**
  171 +
144 ``` 172 ```
145 -git push origin master 173 +git push origin vx.x.0
146 ``` 174 ```
147 175
148 -Next, merge the VERSION into the x-x-stable branch.  
149 -  
150 -### **8. Push to remotes** 176 +### **6. Push to remotes**
151 177
152 For GitLab CE, push to dev, GitLab.com and GitHub. 178 For GitLab CE, push to dev, GitLab.com and GitHub.
153 179
@@ -155,15 +181,22 @@ For GitLab EE, push to the subscribers repo. @@ -155,15 +181,22 @@ For GitLab EE, push to the subscribers repo.
155 181
156 NOTE: You might not have the rights to push to master on dev. Ask Dmitriy. 182 NOTE: You might not have the rights to push to master on dev. Ask Dmitriy.
157 183
158 -### **9. Publish blog for new release**  
159 -* Mention what GitLab is on the second line: GitLab is open source software to collaborate on code.  
160 -* Select and thank the the Most Valuable Person (MVP) of this release.  
161 -* 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. 184 +### **7. Publish blog for new release**
162 185
163 -### **10. Tweet to blog** 186 +Merge the [blog merge request](#1-prepare-the-blog-post) in `www-gitlab-com` repository.
  187 +
  188 +### **8. Tweet to blog**
164 189
165 Send out a tweet to share the good news with the world. List the features in short and link to the blog post. 190 Send out a tweet to share the good news with the world. List the features in short and link to the blog post.
166 191
  192 +Proposed tweet for CE "GitLab X.X.X CE is released! It brings *** <link-to-blogpost>"
  193 +
  194 +Proposed tweet for EE "GitLab X.X.X EE is released! It brings *** <link-to-blogpost>"
  195 +
167 # **23rd - Optional Patch Release** 196 # **23rd - Optional Patch Release**
168 197
  198 +# **24th - Update GitLab.com**
  199 +
  200 +Merge the stable release into gitlab.com. Once the build is green deploy the next morning.
  201 +
169 # **25th - Release GitLab CI** 202 # **25th - Release GitLab CI**