501444 - Get mozilla.com back to Trunk->Stage->Production workflow

Status: VERIFIED FIXED

(www.mozilla.org :: General, defect)

Description

[Steven Garrity [:sgarrity]]

Now that 3.5 is out, we should work on getting back from the firefox3.5 SVN tag into the standard trunk->stage->production workflow (so people can use kubla, etc.)

Comment 1

[Michael Morgan [:morgamic]]

I think we should get trunk pushed to stage, then production.  After which, we can do the same switch back to the proper tag that was used to launch firefox3.5 this morning.

Comment 2

[Michael Morgan [:morgamic]]

Steven, can we safely push everything on trunk to staging, then production?

Right now the only stuff I know I'd have to rollback is the mobile stuff.  Anything that can't go live?

Comment 3

[Steven Garrity [:sgarrity]]

(In reply to comment #2)
> Steven, can we safely push everything on trunk to staging, then production?
> Right now the only stuff I know I'd have to rollback is the mobile stuff. 
> Anything that can't go live?

I think everything else is fine. I'm comparing firefox3.5 (which is temporarily "production" to trunk with this command: 
 svn diff --summarize https://svn.mozilla.org/projects/mozilla.com/tags/firefox3.5 https://svn.mozilla.org/projects/mozilla.com/trunk

and seeing the following:

M  firefox3.5/pt-BR/about/contact.html
A  firefox3.5/en-US/firefox/comingsoon/index.html
A  firefox3.5/en-US/firefox/comingsoon
A  firefox3.5/en-US/mobile/send.php
A  firefox3.5/en-US/mobile/features.html
A  firefox3.5/en-US/mobile/include/download.inc
A  firefox3.5/en-US/mobile/include
A  firefox3.5/en-US/mobile/requirements.html
M  firefox3.5/en-US/mobile/faq.html
M  firefox3.5/en-US/mobile/index.html
M  firefox3.5/style/tignish/mobile.css

You already mentioned the mobile stuff. The firefox/comingsoon seems irrelevant since that is now a redirect, and the firefox3.5/pt-BR/about/contact.html seems like an accent/punctuation fix, though I'm not sure which is correct, trunk or firefox3.5.

Comment 4

[Steven Garrity [:sgarrity]]

firefox3.5/pt-BR/about/contact.html is in sync now too.

Comment 5

[Michael Morgan [:morgamic]]

Planned schedule:
- Monday (7/6): merge trunk onto staging and prod, update product-details
- Monday (7/6): set up secondary vhost auto-pulling from production tag
- Tuesday (7/7): flip production back to production tag during maintenance window

Does that work for everyone?  If so I can work on the merging with Steven and we will need some help from IT for the last two items.  Thanks!

Comment 6

[John Slater]

Plan sounds great to me - thanks for putting this together!

Comment 7

[Pascal Chevrel:pascalc (PTO until April 26)]

good for me too

Comment 8

[John Slater]

Just checking back in here...are we still on track for getting this resolved today?

Comment 9

[Michael Morgan [:morgamic]]

I merged everything back, oremj just updated.

Comment 10

[Michael Morgan [:morgamic]]

Site is running off of trunk->stage->prod tags as before.  Please let me know if there are any issues.  Thanks oremj for updating.

Comment 11

[Stephen Donner [:stephend] Not actively reading bugmail]

As far as I can tell, this has been working just fine.