summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2015-11-26 13:36:36 +0100
committerRuben Pollan <meskio@sindominio.net>2015-11-26 13:40:29 +0100
commitfef4309f1d1b247a2d6bfbb09a101efd218228e1 (patch)
tree8e824bacbcdd0734ebcb2e007745d053062594f2
parent2fffd4413ea2b9785cd8feb254207ed1366b3a15 (diff)
[doc] add workflow documentation into the README.rst
-rw-r--r--README.rst14
1 files changed, 14 insertions, 0 deletions
diff --git a/README.rst b/README.rst
index 107b224..061796a 100644
--- a/README.rst
+++ b/README.rst
@@ -22,3 +22,17 @@ Setting up a slave
- For more information, and since we're using the latest version of
Buildbot, please read `creating a slave
<http://docs.buildbot.net/latest/manual/installation.html#creating-a-buildslave>`_
+
+Workflow
+--------
+
+- Set up a feature branch and push modifications to it.
+- Fetch your feature branch in lizard:/home/buildbot/buildbot-bitmask.
+- Restart the buildbot in the virtualenv::
+
+ root@lizard:/home/buildbot/buildbot-bitmask# source sandbox/bin/activate
+ (sandbox)root@lizard:/home/buildbot/buildbot-bitmask# buildbot restart master
+
+- Once the code is tested in the feature branch it should be rebased/squashed and
+ merged into the master branch.
+- With the code merged into the master branch restart the buildbot using this branch.