1078137 - Merge mozmill-tests branches for Firefox 33 release

Status: RESOLVED FIXED

(Mozilla QA Graveyard :: Mozmill Tests, defect, P1)

Description

[Andrei Eftimie]

As per the release schedule [1] we're having the following dates for the merge:

2014-10-06 (Monday): Beta -> Release
2014-10-13 (Tuesday): Aurora -> Beta &
                      Nightly -> Aurora

With this merge we ought to also fix bug 1061717.
For this the steps mentioned in the merge document [2] should be of help.
Basically check that once merged branches are identical.

With these in mind I will take care of this merge.

[1] https://mail.mozilla.com/home/[e-mail]/Releases%20Scheduling.html
[2] https://developer.mozilla.org/en-US/docs/Mozilla/QA/Mozmill_tests/Merging_named_branches#Diff_branches_before_pushing_merge

Comment 1

[Andrei Eftimie]

Oh, removal of the `mozilla-esr24` branch can also be handled in this bug. That should only be done after the last ESR24 build had been run.

Comment 2

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

No, we do not remove the esr24 branch yet. We will do that once RelEng has killed the appropriate branch. See bug 1062777. We will have a separate bug for it then.

Comment 3

[Andrei Eftimie]

Attachment: merge_beta_release.patch

This is what I am going to push later.
The patch is rather large.

We had several conflicts, mainly due to bug 883120 (which is also responsible for the big patch size).
Also for bug 994117.

And as mentioned previously this also takes care of bug 1061717 (relevant branches).

Finally, I don't see any risk here. Due the the new checks we're doing to compare branches after the merge command and make sure manually that all changes are coming to the lower branch, there should be no problems.

I'm not going to ask for a review here because of the above reasons (patch is large, and since the branches are identical there shouldn't be any risks). I'm still uploading it for safety, and if anyone want's to have a look, please do.

I've ran all testruns and I've gotten 100% green:
functional: http://mozmill-crowd.blargon7.com/#/functional/report/78c2fb649de7649b6e328c24661f432b
update: http://mozmill-crowd.blargon7.com/#/update/report/78c2fb649de7649b6e328c2466202eda
http://mozmill-crowd.blargon7.com/#/update/report/78c2fb649de7649b6e328c2466203e9a
l10n: http://mozmill-crowd.blargon7.com/#/l10n/report/78c2fb649de7649b6e328c24661ff70a
remote: http://mozmill-crowd.blargon7.com/#/remote/report/78c2fb649de7649b6e328c24661eb261
endurance: http://mozmill-crowd.blargon7.com/#/endurance/report/78c2fb649de7649b6e328c2466201aa6
addons: http://mozmill-crowd.blargon7.com/#/addons/report/78c2fb649de7649b6e328c246620104d

Comment 4

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

We could have avoided this large patch if the work on bug 883120 had finished right in time. Sadly there were more than delays in the past weeks.

Comment 5

[Andrei Eftimie]

Beta => Release merge landed:
https://hg.mozilla.org/qa/mozmill-tests/rev/1c248e60a41c (mozilla-beta) tag
https://hg.mozilla.org/qa/mozmill-tests/rev/a16c787f7a10 (mozilla-release) merge
https://hg.mozilla.org/qa/mozmill-tests/rev/071328531625 (mozilla-release) tag

Comment 6

[Andrei Eftimie]

Merge seems to be going forward nicely.

Pushed:
https://hg.mozilla.org/qa/mozmill-tests/rev/4804f8d2d487 [tag] (mozilla-aurora)
https://hg.mozilla.org/qa/mozmill-tests/rev/102fd196d5dd [merge] (mozilla-beta)
https://hg.mozilla.org/qa/mozmill-tests/rev/5965f45117e3 [tag] (mozilla-beta)
https://hg.mozilla.org/qa/mozmill-tests/rev/8743c7547e11 [tag] (default)
https://hg.mozilla.org/qa/mozmill-tests/rev/81264dcce045 [merge] (mozilla-aurora)
https://hg.mozilla.org/qa/mozmill-tests/rev/22b082de558a [tag] (mozilla-aurora)

Ran all testruns against both branches, all green, results on mozmill-crowd.
(not going to link to all of them - 12 links)