855125 - Merge Mozmill branches for Firefox 20 release

Status: RESOLVED FIXED

(Mozilla QA Graveyard :: Mozmill Tests, defect)

Description

[u279076]

The following bug will track migration of the Mozmill Tests branches in preparation for Firefox 20.

Comment 1

[u279076]

Merge mozilla-beta -> mozilla-release
-------------------------------------
http://hg.mozilla.org/qa/mozmill-tests/rev/7942a5017ebc RELEASE_BASE_20130326
http://hg.mozilla.org/qa/mozmill-tests/rev/c6907e79d350 mozilla-beta -> mozilla-release
http://hg.mozilla.org/qa/mozmill-tests/rev/7423c7e74805 FIREFOX_RELEASE_20.0

My apologies, the go to build happened sooner than I anticipate this time around and I was not informed in time. We'll need to retrigger the tests for release candidates. I will try to make sure Release Management keeps us better informed in the future.

Comment 2

[u279076]

I'm not sure if this is related to my merge above but we're seeing a lot of failures in the Addons tests (bug 855142).

Comment 3

[u279076]

My merge has caused a regression in the Private Browsing tests, reverting.

Comment 4

[u279076]

(In reply to Anthony Hughes, Mozilla QA (:ashughes) from comment #3)
> My merge has caused a regression in the Private Browsing tests, reverting.

http://hg.mozilla.org/qa/mozmill-tests/rev/5e9f37ed9876

Comment 5

[u279076]

I think I've royally screwed something up here, I can't seem to get back to a known good state. I don't want to screw this up even more so I'm going to stop.

Henrik or Dave, can either of you try to clean up my mistakes:
http://hg.mozilla.org/qa/mozmill-tests/pushloghtml?fromchange=7942a5017ebc&tochange=b0a52738ab50

Sincerely apologies for screwing this up. I think I screwed up on the Private Browsing code.

Comment 6

[Henrik Skupin [:whimboo][⌚️UTC+1]]

I will work on it. One note for the future, please make sure to check the merge locally before pushing it to the live repository. This is a real mess now and it will take me a while to go through. Mostly because you cannot backout a merge changeset.

Comment 7

[Henrik Skupin [:whimboo][⌚️UTC+1]]

Landed a revert commit which puts mozilla-release back into a good state, which I can use now to merge mozilla-beta:

http://hg.mozilla.org/qa/mozmill-tests/rev/28eea786c10c

Comment 8

[Henrik Skupin [:whimboo][⌚️UTC+1]]

Attachment: faked merge

Andreea, can you please have a look at this patch?

Comment 9

[Andreea Matei [:AndreeaMatei]]

Comment on attachment 730056 [details] [diff] [review]
faked merge

Review of attachment 730056 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good Henrik.

Comment 10

[Henrik Skupin [:whimboo][⌚️UTC+1]]

Merge patch landed as:
http://hg.mozilla.org/qa/mozmill-tests/rev/0b4c65afc9ce

Tag has been added for 20.0 release:
http://hg.mozilla.org/qa/mozmill-tests/rev/095113e860f1

Back to Anthony for the remaining open merges.

Comment 11

[u279076]

Thank you Henrik for fixing this. I'm going to add a step to my checklist to run a local testrun before pushing the changes. Thank you again and apologies for screwing this up.

Comment 12

[Henrik Skupin [:whimboo][⌚️UTC+1]]

Another idea is to close the source and target branch a day before and upload a diff for review. That would be the safest way I assume.

Comment 13

[u279076]

Merge mozilla-aurora -> mozilla-beta
------------------------------------
http://hg.mozilla.org/qa/mozmill-tests/rev/c1a1687d14c5 BETA_BASE_20130401
http://hg.mozilla.org/qa/mozmill-tests/rev/5fbdd3e32daa mozilla-aurora -> mozilla-beta
http://hg.mozilla.org/qa/mozmill-tests/rev/e62d4f875b59 FIREFOX_BETA_21.0

Comment 14

[u279076]

Merge default -> mozilla-aurora
-------------------------------
http://hg.mozilla.org/qa/mozmill-tests/rev/b793d2d6ddd8 AURORA_BASE_20130401
http://hg.mozilla.org/qa/mozmill-tests/rev/fb2644937f48 default -> mozilla-aurora
http://hg.mozilla.org/qa/mozmill-tests/rev/e9bc250033ac FIREFOX_AURORA_22.0