Skip to content

Commit

Permalink
Merge pull request #1 from magopian/docs-push-duty
Browse files Browse the repository at this point in the history
Add some docs on the push duty
  • Loading branch information
Andy McKay committed Sep 14, 2015
2 parents d76b251 + c4a8308 commit 57e553c
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 3 deletions.
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
language: python
sudo: false
python:
- "2.7"
env:
- TOX_ENV=docs
install:
- pip install -rrequirements/docs.txt
script:
- cd docs && make clean html linkcheck SPHINXOPTS='-nW'
notifications:
irc:
channels:
- "irc.mozilla.org#amo-bots"
on_success: change
on_failure: always
Empty file added docs/_static/.gitkeep
Empty file.
34 changes: 31 additions & 3 deletions docs/server/push-duty.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,46 @@ The pushing of the server rotates each week to another developer. Current rotati
Before the push
---------------

The server components are tagged on:
The code that will go in production on thursday is tagged on tuesday. It's
usually the master branch that is tagged::

$ git checkout master
$ git pull
$ git tag 2015.09.10
$ git push --tags

If tagging the master branch can't be done (some feature is already on master,
but not ready for production), then instead the commits that need to go in
production should be cherry-picked::

$ git checkout 2015.09.03 # Previous tag pushed to production.
$ git cherry-pick <commit hash>
$ git tag 2015.09.10
$ git push --tags

An etherpad is created that contains blocking bugs and the like, for example:

https://etherpad.mozilla.org/amo-2015-09-10

You can use this handy template:

.. literalinclude:: /server/push_etherpad.tpl

Once the tag is done, it needs to be pushed to the staging server, using the
ops jenkins: click on "build with parameters", and enter the tag (eg
2015.09.10). Jason can help with that if needed.

Push
----

The server is pushed by:
The tag is pushed to production by Jason, once approved by Krupa, on thursdays.
It is the responsibility of the push hero to follow-up with Krupa and Jason,
and be around during the push for any unexpected issues.

After completing a push, send an email to the dev.addons mailing list saying
that the push is done with any issues. Here's the template:

After completing a push, send an email to the dev.addons mailing list with any issues.
.. literalinclude:: /server/push_email.tpl

Future Goals
------------
Expand Down
11 changes: 11 additions & 0 deletions docs/server/push_email.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
This week's push is done!

Notes:
https://etherpad.mozilla.org/amo-YYYY-MM-DD

Issues:
None

Next Push:
<push hero>
https://etherpad.mozilla.org/amo-YYYY-MM-DD
28 changes: 28 additions & 0 deletions docs/server/push_etherpad.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
This week's push hero is <push hero>

Notable things shipping:


Blockers:


To pick. Link to the actual commits - NOT the merge commits. This list needs
to be in chronological order, first to cherry-pick on top.:


Pushing:

https://github.com/mozilla/olympia/compare/YYYY.MM.DD...YYYY.MM.DD


Before we push:

-------------------------------------------------------------------------------
Before we start:


After we're done:


start:
end:

0 comments on commit 57e553c

Please sign in to comment.