The pushing of the server rotates each week to another developer. Current rotation is:
Check out the Add-ons calendar for a list of events.
Before the push¶
The code that will go in production on Thursday is tagged on Tuesday. The following repositories are tagged:
Project dependencies are not tagged as part of the push duty responsibilities. If you’re working on a feature in a project that’s a dependency of a project e.g. addons-linter, then it’s your responsibility to make a release and update the project that consumes that dependency in time for the tag.
This way we can ensure that:
- Dependency packages are built and released in time for the tag.
- The new feature in the new version of a package has been validated on -dev.
Making multiple releases of a package during a weekly milestone is totally fine since this helps with testing smaller sets of changes.
Security fixes for addons-server live on a separate private repository:
To make merging easier, when making a pull request against this repository, the remote branch should not be published to one’s fork but to the repository itself. Once the PR has been reviewed, it should not be merged right away. Instead, merging to master is part of push duty and happens right before tagging:
$ git checkout master $ git pull $ git fetch security $ git merge security/<branch-name> $ git diff upstream/master $ git push upstream master $ git push security master
mozilla/addons-server-security master branch should never be pushed to directly without pushing to mozilla/addons-server master first - the two should always stay in sync.
This means the merge or edit buttons in github web UI must never be used in that repository.
Here we are using upstream and security remotes, which point to mozilla/addons-server and mozilla/addons-server-security, respectively. If your configuration is different you can substitute upstream and security for whatever you call the mozilla/addons-server and mozilla/addons-server-security repositories’ remotes.
Tag the repos¶
Tags are of the format: YYYY.MM.DD,
The date is the date of the push, not the date of tagging.
Once addons-frontend has been tagged a new docker image will be built on CircleCI and is required to deploy to stage.
It’s usually the master branch that is tagged:
$ git checkout master $ git pull $ git tag 2015.09.10 $ git push upstream 2015.09.10
Here we are using “upstream” as the remote. If yours is different you can substitute “upstream” for whatever you call the mozilla/addons-server repo remote.
Get a compare link from github to compare this tag to the last tag. Add that compare link to the etherpad so that people can clearly see what is pushing.
If tagging the master branch can’t be done (some feature is already on master, but not ready for production), then the commits that need to be released should be cherry-picked
If you’re adding cherry-picks to a tag that already exists, it makes sense to create a new tag rather than overwrite the old one. The reason for this is that re-using a tag makes it less easy to see the process that was involved in arriving at that tag. Also, it’s entirely possible to make a mistake by using an old tag that exists locally rather than the newer version on the remote when tags are re-used.
When creating a new tag you can use the format YYYY.MM.DD-SUFFIX where suffix is a number that’s incremented with each revision. The first time this is done will look like this:
$ git checkout 2015.09.03 $ git cherry-pick <commit hash> # as many times as you need $ git tag 2015.09.10-1 $ git push upstream 2015.09.10-1
And the second:
$ git checkout 2015.09.03-1 $ git cherry-pick <commit hash> # as many times as you need $ git tag 2015.09.10-2 $ git push upstream 2015.09.10-2
Then update the etherpad with the new comparison link for the updated tag.
Push to stage¶
Our infrastructure automates pushing the tags to stage once the tags have been pushed up to the repository.
The only required step is to check the tag has deployed by looking out for the automated push messages in the irc channel.
You can also check /__version__ on a given service which shows the currently deployed revision and tag e.g:
Before the push¶
Keep an eye out for any blocking bugs. Add them to the etherpad and find someone to work on them.
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.
Monitoring the push¶
The best places to monitor the results of the push are:
The site performance graphs should show no large spikes or changes. Sentry should show no new errors, although it will show intermittent errors and the occasional error as the push occurs.
Create a new etherpad page for the next push, for example:
You can use this handy template:
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/addons-server/compare/YYYY.MM.DD...YYYY.MM.DD https://github.com/mozilla/addons-frontend/compare/YYYY.MM.DD...YYYY.MM.DD Before we push: ------------------------------------------------------------------------------- Before we start: After we're done: start: end:
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:
This week's push is done! Notes: https://public.etherpad-mozilla.org/p/amo-YYYY.MM.DD Issues: None Next Push: <push hero> https://public.etherpad-mozilla.org/p/amo-YYYY.MM.DD
Set the topic of the #amo channel to include the new etherpad link and the IRC nick of next week’s push hero.
Move to continuous deployment and change the way this is done dramatically.