945708 - Merge mozmill-tests branches for Firefox 26 release

Status: RESOLVED FIXED

(Mozilla QA Graveyard :: Mozmill Tests, defect)

Description

[Andrei Eftimie]

This is a tracking bug for merging the mozmill-tests branches for the upcoming Firefox 26 release.

Comment 1

[Andreea Matei [:AndreeaMatei]]

Attachment: merge Beta-Release

These are the changes, I have added the tags as well on my working repository, for landing.

Comment 2

[Andrei Eftimie]

Comment on attachment 8341694 [details] [diff] [review]
merge Beta-Release

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

Looks good, lets get this in.

Comment 3

[Andreea Matei [:AndreeaMatei]]

http://hg.mozilla.org/qa/mozmill-tests/rev/28b6ce415c15 (mozilla-beta tag)
http://hg.mozilla.org/qa/mozmill-tests/rev/b37b6f307da7 (mozilla-release merge)
http://hg.mozilla.org/qa/mozmill-tests/rev/35ed4f6ce7f7 (mozilla-release tag)

Comment 4

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

Comment on attachment 8341694 [details] [diff] [review]
merge Beta-Release

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

::: .hgtags
@@ +101,5 @@
>  92af909ac97fcbaa538463ff1f33cfbd420e2083 RELEASE_BASE_20130909
>  393c4491bb95d60632984433bbd8f56a4f249032 FIREFOX_AURORA_25.0
>  63a310d9c807b14a90ae6789d99914d701e8b0aa BETA_BASE_20130916
> +7508d946fd80f40937b7c1d55e2765452ced1e12 FIREFOX_AURORA_26.0
> +0aa97dc0b0ba5021c45f715a607b3d85676ba4a9 BETA_BASE_20131028

Why are you changing and adding lines for older releases? I think that needs to be fixed.

Comment 5

[Andreea Matei [:AndreeaMatei]]

Comment on attachment 8341694 [details] [diff] [review]
merge Beta-Release

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

::: .hgtags
@@ +101,5 @@
>  92af909ac97fcbaa538463ff1f33cfbd420e2083 RELEASE_BASE_20130909
>  393c4491bb95d60632984433bbd8f56a4f249032 FIREFOX_AURORA_25.0
>  63a310d9c807b14a90ae6789d99914d701e8b0aa BETA_BASE_20130916
> +7508d946fd80f40937b7c1d55e2765452ced1e12 FIREFOX_AURORA_26.0
> +0aa97dc0b0ba5021c45f715a607b3d85676ba4a9 BETA_BASE_20131028

Hm, I tried to leave all the tags from the merge and not delete anything. I will fix it.

Comment 6

[Andrei Eftimie]

This evening the merge will be done for the remaining branches.

We will have to merge:
mozilla-aurora > mozilla-beta
default > mozilla-aurora

I will handle the merge late this evening once the Firefox trees are merged.

Comment 7

[Andrei Eftimie]

Attachment: merge_aurora_beta.patch

Merge Aurora into Beta

Comment 8

[Andrei Eftimie]

Attachment: merge_default_aurora.patch

Merge Default into Aurora

I'm running some tests ATM

Comment 9

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

Comment on attachment 8344863 [details] [diff] [review]
merge_aurora_beta.patch

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

If you did a testrun with those patches on a single platform and all pass you get my r+. Totally unrelated but seen when checking this patch for review, we have way too many skipped tests which we really should get fixed!

Comment 10

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

Comment on attachment 8344864 [details] [diff] [review]
merge_default_aurora.patch

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

Looks good if the testrun for it passes.

Comment 11

[u279076]

Thanks for jumping on this while I was away. I expect the Firefox aurora->beta and central->aurora migrations to happen today (Monday, December 9, 2013). FYI, Australis will not be uplifting to Aurora which means the Firefox code merging to Aurora will actually be coming from the Holly branch. I'm not sure this changes anything with the mozmill-tests migrations; it may just mean something extra to look out for in the Aurora sign-off.

Comment 12

[Andrei Eftimie]

All looks good.

Landed:
http://hg.mozilla.org/qa/mozmill-tests/rev/ed5cf1a60a14 (mozilla-aurora) tag
http://hg.mozilla.org/qa/mozmill-tests/rev/6c5d3ee729ac (mozilla-beta) merge
http://hg.mozilla.org/qa/mozmill-tests/rev/049e5b62066a (mozilla-beta) tag

http://hg.mozilla.org/qa/mozmill-tests/rev/96e0a911d9fe (default) tag
http://hg.mozilla.org/qa/mozmill-tests/rev/dc2bda0eda70 (mozilla-aurora) merge
http://hg.mozilla.org/qa/mozmill-tests/rev/4e9f4f451d33 (mozilla-aurora) tag

Hi Anthony,
as you see we just completed the merge.

We should not have any problems with Holly.
I've just ran some testruns with the merged aurora branch against a Holly build and all looks good.