As per the release schedule we'll have on: 2014-07-14: Beta => Release merge 2014-07-21: Aurora => Beta and Nightly => Aurora merge  https://firstname.lastname@example.org/Releases%20Scheduling.html
We will prepare the patch today and test it. Kamil, will you be able to handle this?
Andreea, I won't have time this time around as I'm doing ESR24 and fx31 verifications and there's still a good amount of work to be done.
I see. Nils, can you help then?
This is for beta-release, we had 2 conflicts, the usual in .hgtags and another in the manifest from remote restart tests, as release didn't had testSafeBrowsing_initialDownload. Still have to test this now.
So has this patch been tested? It would have been really good to have this information now, given that I have to immediately merge the branches! Can we please make sure to prepare the patches already on Friday and get it fully tested? This adds extra burden for the merge in the evening/night.
Assignee: nobody → hskupin
I assume the patch is ready and works. So I'm going to merge the branches now: https://hg.mozilla.org/qa/mozmill-tests/rev/6990906f2dbf (Added tag RELEASE_BASE_20140714 for changeset 76f7df61ebaf) https://hg.mozilla.org/qa/mozmill-tests/rev/b982f90b01d9 (Merge mozilla-beta to mozilla-release for Firefox 31) https://hg.mozilla.org/qa/mozmill-tests/rev/b206597569a7 (Added tag FIREFOX_RELEASE_31 for changeset b982f90b01d9)
Something this bug doesn't tell is the creation of the mozilla-esr31 branch. Yes, we get a new named branch. So here the steps I did: $ hg up -C mozilla-release 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg branch mozilla-esr31 marked working directory as branch mozilla-esr31 (branches are permanent and global, did you want a bookmark?) $ hg branch mozilla-esr31 $ hg push --new-branch pushing to ssh://hg.mozilla.org/qa/mozmill-tests/ searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 0 changes to 0 files (+1 heads) remote: Trying to insert into pushlog. remote: Please do not interrupt... remote: Inserted into the pushlog db successfully. remote: You can view your change at the following URL: remote: https://hg.mozilla.org/qa/mozmill-tests/rev/b85a9a198911
Documentation for creating a new ESR branch has been put up here: https://developer.mozilla.org/en-US/docs/Mozilla/QA/Mozmill_tests/Merging_named_branches#Creating_a_new_ESR_Branch So someone else should take care of the next merge, when I'm out. So hopefully Kamil will be able to cover that then by next Monday.
Summary: Merge mozmill-tests branches for Firefox 31 release → Merge mozmill-tests branches for Firefox 31 release and create mozmill-esr31 branch
We see lots of failures for the tests against Firefox 31.0ESR. When checking the diff between mozilla-esr31 and mozilla-release, a lot of changes are shown. That should not happen. Also the change as landed has as parent 3722:fdaf555da907, which is a changeset from February! http://hg.mozilla.org/qa/mozmill-tests/rev/fdaf555da907 So something with the branch creation went wrong. I'm sure I did a 'hg pull', but I cannot promise. So what we should do now is merging all the remaining changes from mozilla-release into mozilla-esr31. The merge can be done without any conflicts, which I expect.
The following changeset will fix all the problems for esr31: https://hg.mozilla.org/qa/mozmill-tests/rev/b8637d05a1d3 Sorry for having this messed-up. I will improve the documentation so this will certainly not happen again.
I'll take care of the remaining branches. Merge day is today.
Assignee: nobody → andrei.eftimie
Status: NEW → ASSIGNED
Pushed: https://hg.mozilla.org/qa/mozmill-tests/rev/46d3428cdc57 (mozilla-aurora) [tag] https://hg.mozilla.org/qa/mozmill-tests/rev/970f4af2e9f0 (mozilla-beta) [merge] https://hg.mozilla.org/qa/mozmill-tests/rev/a14df1fc1d61 (mozilla-beta) [tag] https://hg.mozilla.org/qa/mozmill-tests/rev/88d4b30859cd (default) [tag] https://hg.mozilla.org/qa/mozmill-tests/rev/02b176896102 (mozilla-aurora) [merge] https://hg.mozilla.org/qa/mozmill-tests/rev/86712ee46765 (mozilla-aurora) [tag] All tests appear to be fine.
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.