869242 - Merge mozmill-tests branches for Firefox 21 release

Status: RESOLVED FIXED

(Mozilla QA Graveyard :: Mozmill Tests, defect)

Description

[u279076]

This is a tracking bug to track the migration of the Mozmill Tests branches in line with the Firefox 21 branch migrations.

I anticipate the beta->release merge to occur tonight/tomorrow with the aurora->beta and central->aurora merges coming next Monday.

Comment 1

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

So Anthony mentioned that Bhavana will do the merge last night. As we have seen now nothing like that happened and RCs for the 20.0 are available and caused test failures across several tests due to the missing merge.

I will step in as of now and will do the merge but for the future *please* ensure to merge our tests before any builds are kicked off. Thanks!

Comment 2

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

http://hg.mozilla.org/qa/mozmill-tests/rev/ce94dcb04716 (Added tag RELEASE_BASE_20130507)
http://hg.mozilla.org/qa/mozmill-tests/rev/12a7aa5126dc (Merge mozilla-beta to mozilla-release for Firefox 21.0)
http://hg.mozilla.org/qa/mozmill-tests/rev/9c089cc1603d (Added tag FIREFOX_RELEASE_21.0)

Anthony, while doing the merge I have seen that the .hgtags file on mozilla-release does not contain any tag for a Firefox release. When you solve the merge conflicts always take ALL the tags and don't remove any of those. That's how it is described on MDN. Otherwise we will loose tags for releases. Thanks

https://developer.mozilla.org/en-US/docs/Mozmill_Tests/Merging_named_branches?redirectlocale=en-US&redirectslug=Mozmill_Tests%2FBranch_Merge

Comment 3

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

I have re-triggered all the tests for Linux and Mac which have already been run and were failing. For the future please make sure to better coordinate that task. It looks like we have issues each time when it comes to a merge.

Comment 4

[u279076]

Thanks for stepping in here to help Henrik. I apologize for the issues this time around in the process. Lets work offline to nail down a better process since it seems like there's always something that goes wrong.

Comment 5

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

Merge for aurora -> beta done:
http://hg.mozilla.org/qa/mozmill-tests/rev/4e64b1776ee2 (Added tag BETA_BASE_20130513)
http://hg.mozilla.org/qa/mozmill-tests/rev/6a58cd1dcc57 (Merge mozilla-aurora to mozilla-beta for Firefox 22.0)
http://hg.mozilla.org/qa/mozmill-tests/rev/1ceea2c49f1c (Added tag FIREFOX_BETA_22.0)

Comment 6

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

Merge for default -> aurora done:
http://hg.mozilla.org/qa/mozmill-tests/rev/997d5199dfc6 (Added tag AURORA_BASE_20130513)
http://hg.mozilla.org/qa/mozmill-tests/rev/09cc205ecc54 (Merge default to mozilla-aurora for Firefox 23.0)
http://hg.mozilla.org/qa/mozmill-tests/rev/1d320bf6d919 (Added tag FIREFOX_AURORA_23.0)

Nothing else left here. So closing.

Comment 7

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

Doh. I made a mistake when running the merge from aurora->beta:

http://mozmill-ci.blargon7.com/#/functional/report/14f8bc4e22e61353662cded4c2303d09

Tests show a redeclaration of TEST_URL for the following tests:
 
/testLayout/testNavigateFTP.js
/testSecurity/testSSLDisabledErrorPage.js
/testSecurity/testUnknownIssuer.js

I will fix it now.

Comment 8

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

I fixed it with the landing of:
http://hg.mozilla.org/qa/mozmill-tests/rev/b454ee5056eb

I'm not sure how those changes came in. :/ Sorry.