From 74dcbdb0673dcf1a51f1d57bda233fa3201dc7c0 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 4 Apr 2014 13:18:01 +0200
Subject: [PATCH] Add more details to the release documentation

---
 doc/release.md | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/doc/release.md b/doc/release.md
index 1d41fae..0bbfd64 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -29,6 +29,19 @@ git push origin 6-6-stable 6.6.0.omnibus
 
 ## On the build machines
 
+### One-time
+
+- Set up the `attach.sh` script
+
+```shell
+sudo su - omnibus-build
+cat > attach.sh <<EOF
+#!/bin/sh
+script -c 'screen -x || screen' /dev/null
+EOF
+chmod +x attach.sh
+```
+
 - Install release dependencies
 
 ```shell
@@ -43,11 +56,23 @@ sudo pip install awscli
 aws configure # enter AWS key and secret
 ```
 
-- Check out the release branch of omnibus-gitlab.
+- Set up a deploy key to fetch the GitLab EE source code.
+
+### Each build
+
+- Log in as the build user and start a screen session
 
 ```shell
+sudo su - omnibus-build
+./attach.sh
+```
+
+- Check out the release tag of omnibus-gitlab.
+
+```shell
+cd ~/omnibus-gitlab
 git fetch
-git checkout 6-6-stable
+git checkout 6.6.0.my-tag
 ```
 
 - Check the system time; the S3 upload will fail if it is off by too much
@@ -58,7 +83,7 @@ date
 
 You can adjust the time with the `date` command if necessary.
 
-- Run the release script
+- Start the release script
 
 ```shell
 ./release.sh
@@ -66,4 +91,11 @@ You can adjust the time with the `date` command if necessary.
 
 This will `clean --purge` the build environment, build a package and upload it to S3.
 
+- Detach from screen: press Ctrl-a DD
+- Check in on the build after 30 minutes.
+- When the build is done, update the download page with the package URL's and MD5 hashes.
+
+See a previous [CE example](https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/141)
+and [EE example](https://dev.gitlab.org/gitlab/gitlab-ee/commit/7301417820404f92ca7c0a9940408ef414ef3c01).
+
 [the gitlab-rails version in omnibus-gitlab]: ../config/software/gitlab-rails.rb#L20
--
libgit2 0.21.2