1176351 - Merge firefox-ui-tests branches for Firefox 39 release

Status: RESOLVED FIXED

(Testing :: Firefox UI Tests, defect, P1)

Description

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

As per the release schedule[1] we'll have to merge our tests for the upcoming Firefox 39 release. The merge from beta->release will happen today. So I hope this first merge will go smooth. I will check which steps are necessary and document those appropriately.

2015-06-29 	Firefox 42 	Firefox 41 	Firefox 40 	2015-06-30 	Firefox 39 

[1] https://wiki.mozilla.org/RapidRelease/Calendar

The other branches will be merged on June 28th.

Comment 1

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

There were no conflicts this time to solve. So the merge went pretty smooth. Given all of our cherry-picks between master and aurora I expect much trouble for the next merge. Just to note what I did today, and so that I can enhance the steps next time, here the list:

git reset --hard && git checkout mozilla-beta
git pull upstream mozilla-beta
git tag RELEASE_BASE_`date +%Y%m%d`
git push --tags upstream

git reset --hard && git checkout mozilla-release
git pull upstream mozilla-release
git rebase mozilla-beta
git pull upstream mozilla-release (to merge in differences after rebase)
git tag FIREFOX_RELEASE_%VERSION%
git push upstream mozilla-release
git push --tags upstream


https://github.com/mozilla/firefox-ui-tests/commits/RELEASE_BASE_20150619
https://github.com/mozilla/firefox-ui-tests/commit/5959e22bd61b3b31e5c9e6d21f433465405349d9 (merge)
https://github.com/mozilla/firefox-ui-tests/commits/FIREFOX_RELEASE_39.0

Comment 2

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

Merge for mozilla-aurora => mozilla-beta has been done without any conflicts. I was really surprised! Most likely I will hit the huge list of merge conflicts next.

Here the steps I did:

git reset --hard && git checkout mozilla-aurora
git pull upstream mozilla-aurora
git tag BETA_BASE_`date +%Y%m%d`
git push --tags upstream

git reset --hard && git checkout mozilla-beta
git pull upstream mozilla-beta
git rebase mozilla-aurora
git pull upstream mozilla-beta (to merge in differences after rebase)
git tag FIREFOX_BETA_%VERSION%
git push upstream mozilla-beta
git push --tags upstream

https://github.com/mozilla/firefox-ui-tests/commits/BETA_BASE_20150630
https://github.com/mozilla/firefox-ui-tests/compare/5a426c0c73e7...d2a5611ec10f
https://github.com/mozilla/firefox-ui-tests/commits/FIREFOX_BETA_40.0

Comment 3

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

Also the merge from master to mozilla-aurora has been done. The merge conflicts were actually kinda easy to solve. For reference here the commands I issued:

git reset --hard && git checkout master
git pull upstream master
git tag AURORA_BASE_`date +%Y%m%d`
git push --tags upstream

git reset --hard && git checkout mozilla-aurora
git pull upstream mozilla-aurora
git rebase master (usual tasks to fix merge conflicts)
git pull upstream mozilla-aurora (to merge in differences after rebase)
git tag FIREFOX_AURORA_%VERSION%
git push upstream mozilla-aurora
git push --tags upstream

I will get the documentation for the merge steps created when I'm back beginning of August.

https://github.com/mozilla/firefox-ui-tests/commits/AURORA_BASE_20150630
https://github.com/mozilla/firefox-ui-tests/compare/4482ada6a7a6...94857a319b56
https://github.com/mozilla/firefox-ui-tests/commits/FIREFOX_AURORA_41.0

Comment 4

[Eric Shepherd [:sheppy]]

(In reply to Henrik Skupin (:whimboo) [away 07/01 - 07/31] from comment #3)

> I will get the documentation for the merge steps created when I'm back
> beginning of August.
> 
> https://github.com/mozilla/firefox-ui-tests/commits/AURORA_BASE_20150630
> https://github.com/mozilla/firefox-ui-tests/compare/4482ada6a7a6...
> 94857a319b56
> https://github.com/mozilla/firefox-ui-tests/commits/FIREFOX_AURORA_41.0

Henrik, is there anything you need from the MDN writing team here?

Comment 5

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

Thanks for the question Eric. But no, I will get this content added myself to MDN. Given that I will be away the next 4 weeks it will have to wait until then. Also because we don't have a landing page yet for all of this new stuff. If the keyword is in your way, feel free to kill it and maybe add it as whiteboard entry instead.

Comment 6

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

For now I put the instructions in the wiki of the firefox-ui-tests repository:
https://github.com/mozilla/firefox-ui-tests/wiki/Merge-of-branches-for-Firefox-releases

Once we have more experience with the steps and remaining issues have been resolved, we might want to add all to MDN.