Personal tools

Mozilla.com

From MozillaWiki

(Difference between revisions)
Jump to: navigation, search
 
(30 intermediate revisions by 3 users not shown)
Line 15: Line 15:
 
= Projects  =
 
= Projects  =
  
*[[Mozilla.com/Localization|Localization of mozilla.com]]
+
* [https://wiki.mozilla.org/Mozilla.com/Bedrock Bedrock]: A new platform for mozilla.org in Python
 +
* [https://wiki.mozilla.org/Mozilla.com/2011-Rebranding-Project 2011 Rebranding Project]: Merging sites under the .org domain name
 +
* [https://wiki.mozilla.org/Mozilla.com/Tests Automated tests]: Writing Selenium tests to run in Jenkins to make sure the live site works as expected
 +
* [https://wiki.mozilla.org/Mozilla.com/Newsletters Newsletters]: Responsys integration and a centralized email service
  
= Roadmap =
+
= Docs =
  
[[https://wiki.mozilla.org/Mozilla.org/Roadmap_2011]]
+
Please view http://readthedocs.org/docs/bedrock/en/latest/php.html for all the documentation for mozilla.org. It explains how to install it, what the merge is, how to rollout code, how our workflow works, and more.
 
+
mozilla.org and mozilla.com will be merging soon, and the above roadmap applies to both sites.
+
 
+
= Workflow  =
+
 
+
Work is done on trunk, pushed through a staging branch for review/testing, and pushed to a production branch to go live.
+
 
+
# Dev works on a bug and makes a commit to trunk with bug number, leaves a comment on bug with trunk revision (multiple commits per bug are fine)
+
# When fixed, dev marks bug as "resolved fixed", merges all changes into "stage" branch, leaves comment on bug with stage revision
+
# If requesting code review (larger changes), attach patch from stage's revision and flag for review
+
# Add keyword "qawanted" to bug to move to testing
+
# QA checks on stage, approves by replacing the "qawanted" keyword with "qaverified"; if not, QA re-opens bug and removes "qawanted" keyword
+
# '''If the bug is ready to be pushed to production''', anyone can add "push-needed" keyword.  '''If the bug is waiting on a particular launch date, don't add this'''
+
# Dev pushes all related staging revisions (usually just one) to "prod" branch leaving commit with new revision number, removes "push-needed" keyword
+
# QA checks on production, marks "verified fixed"; if there's a problem, re-opens bug and removes "qaverified" keyword, dev might revert changes on production if problem is critical
+
 
+
Here are a few example SVN commands one might use:
+
 
+
commit to trunk (r100)
+
  svn commit -m 'bug 60000 - spread happiness around'
+
+
merge to staging (r50)
+
  svn merge --ignore-ancestry -c100 trunk tags/stage
+
  cd tags/stage && svn commit -m 'r100 from trunk for bug 60000'
+
+
get patch from staging
+
  cd tags/stage && svn diff -c50
+
+
merge to prod (r40)
+
  svn merge --ignore-ancestry -c50 tags/stage tags/prod
+
  cd tags/prod && svn commit -m 'r50 from staging for bug 60000'
+
+
revert on prod
+
  cd tags/prod && svn merge -c-40 .
+
 
+
The important point in this process is that the developer can commit what he/she wants to trunk, but he/she is responsible for merging those changes into stage.  Since it potentially collapses many small commits into one large bugfix commit, it helps in the publishing process.
+
 
+
QA should always test on staging (https://www.authstage.mozilla.com/) to force devs to follow this process.
+
 
+
= Mozilla.com SVN Source  =
+
 
+
The source behind mozilla.com (PHP, HTML, images, CSS, javascript, etc.) is hosted and managed in Subversion. For details merging from trunk to stage, see the [[Webtools:SVN Guidelines|SVN Guidelines]].
+
 
+
*'''Trunk''' - the main development version of mozilla.com. Most work happens here.
+
**SVN location: http://viewvc.svn.mozilla.org/vc/projects/mozilla.com/trunk/
+
**Preview URL: https://www-trunk.stage.mozilla.com/
+
 
+
*'''Stage''' - When changes are ready in trunk, they are [[Webtools:SVN Guidelines#Tagging_for_Staging_.2F_Production_using_svn_merge|merged to stage]] for review before going to production.
+
**SVN location: http://viewvc.svn.mozilla.org/vc/projects/mozilla.com/tags/stage/
+
**Preview URL: https://www.authstage.mozilla.com/
+
 
+
*'''Production''' - The live website. Beware!
+
**SVN location: http://viewvc.svn.mozilla.org/vc/projects/mozilla.com/tags/production/
+
**Preview URL: https://www.mozilla.com/
+
 
+
<br>
+
 
+
= Meeting Notes  =
+
 
+
*[[Mozilla.com:Meeting Notes/09-Dec-2005|09-Dec-2005]]
+
  
 
= Bugs  =
 
= Bugs  =
  
 
[https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&product=Websites&component=www.mozilla.com&resolution=---&chfieldto=Now See all bugs related to mozilla.com]
 
[https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&product=Websites&component=www.mozilla.com&resolution=---&chfieldto=Now See all bugs related to mozilla.com]
 
= Docs  =
 
 
*[[Mozilla.com/UpdatingProductDetails|How to update product-details]]
 

Latest revision as of 16:37, 11 January 2012

mozilla.com was launched on November 29, 2005 with the Firefox 1.5 release with the goal of simplifying the experience of obtaining Mozilla products.

The mission of mozilla.com is to:

  • provide a quick and easy path for obtaining our software
  • educate visitors about the advantages of our software
  • connect users with other Mozilla web properties they may be looking for

The audiences for mozilla.com:

  • End users of Mozilla products (both consumers and power users)
  • Current Firefox and Thunderbird users looking for upgrade information
  • Visitors interested in information about Mozilla Corporation

[edit] Projects

  • Bedrock: A new platform for mozilla.org in Python
  • 2011 Rebranding Project: Merging sites under the .org domain name
  • Automated tests: Writing Selenium tests to run in Jenkins to make sure the live site works as expected
  • Newsletters: Responsys integration and a centralized email service

[edit] Docs

Please view http://readthedocs.org/docs/bedrock/en/latest/php.html for all the documentation for mozilla.org. It explains how to install it, what the merge is, how to rollout code, how our workflow works, and more.

[edit] Bugs

See all bugs related to mozilla.com