The idea is to build 47.0.2 or some other old release using jamun or some other branch.

I'll try to test 2 things: * CI builds work * release promotion works

Comment on attachment 8800689 [details] Bug 1309894 - Use dev-* update channels on jamun. https://reviewboard.mozilla.org/r/85576/#review84148 This form of one-off scares me a LOT (though I suspect I can be scared less when everything is in taskcluster)

Comment on attachment 8800689 [details] Bug 1309894 - Use dev-* update channels on jamun. https://hg.mozilla.org/build/buildbot-configs/rev/6f25921852c31bee7f20101c2692f890b871aa4d

In production: https://hg.mozilla.org/build/buildbot-configs/rev/6f25921852c3

this is what I did so far: $ hg clone https://hg.mozilla.org/projects/jamun $ hg clone -r FIREFOX_47_0_1_RELEASE https://hg.mozilla.org/releases/mozilla-release $ cd jamun $ hg id c7f77d4cd7da9f8ee19eca47a67b565d0a9f6041 $ hg --debug -R ../mozilla-release id 7f5abf95991bda0bc2b8e0d774a8866b726b312b $ hg pull -r 7f5abf95991bda0bc2b8e0d774a8866b726b312b ../mozilla-release $ hg debugsetparents 7f5abf95991bda0bc2b8e0d774a8866b726b312b c7f77d4cd7da9f8ee19eca47a67b565d0a9f6041 $ hg commit -m "Merge heads" $ hg push -r . ssh://hg.mozilla.org/projects/jamun Still need to clone the tools repo, blocked by bug 1309954

In case you were wondering why they weren't appearing, the Taskcluster jobs Treeherder is receiving from Taskcluster are currently resulting in ValueErrors during ingestion, due to the use of the old style revision hashes. eg: https://rpm.newrelic.com/accounts/677903/applications/14179757/filterable_errors#/show/fe7191e6-91a1-11e6-9c7c-b82a72d22a14_0_4610/stack_trace?top_facet=transactionUiName&primary_facet=error.class&barchart=barchart&_k=swnu8w

Ooh, interesting. I think it's ok, because we do not rely yet on TC builds.

Comment on attachment 8803198 [details] Bug 1309894 - Use "poll_all_branches" to explicitly set polling behaviour https://reviewboard.mozilla.org/r/87474/#review86578

Comment on attachment 8800689 [details] Bug 1309894 - Use dev-* update channels on jamun. https://reviewboard.mozilla.org/r/85576/#review86582

Comment on attachment 8800689 [details] Bug 1309894 - Use dev-* update channels on jamun. https://hg.mozilla.org/build/buildbot-configs/rev/f3d8389cb9bfd9eaa8c498ecf63ec90b08600de2

Comment on attachment 8803198 [details] Bug 1309894 - Use "poll_all_branches" to explicitly set polling behaviour https://hg.mozilla.org/build/buildbotcustom/rev/422f21b8f5fc104005dfce15f3c31671144ee41d

In production: https://hg.mozilla.org/build/buildbot-configs/rev/f3d8389cb9bf

In production: https://hg.mozilla.org/build/buildbotcustom/rev/422f21b8f5fc

The scheduling part worked as expected. Next step is to make the patcher config work. The current plan is: # using my user repo of tools: cd tools hg update FIREFOX_47_0_1_RELEASE_RUNTIME hg branch FIREFOX_47_0_3 # to match the current in-tree version hg copy release/patcher-configs/mozRelease-branch-patcher2.cfg release/patcher-configs/mozJamun-branch-patcher2.cfg hg commit -m "Create FIREFOX_47_0_3" hg push --new-branch # mozilla-unified cd ../mozilla-unified hg up 8710c00197cf43e2f5bc869066188c15eed91623 # 47.0.3 on jamun vi testing/mozharness/configs/releases/dev_updates_firefox_release.py hg diff --- a/testing/mozharness/configs/releases/dev_updates_firefox_release.py +++ b/testing/mozharness/configs/releases/dev_updates_firefox_release.py @@ -4,7 +4,7 @@ config = { # TODO: use real repo "repo": { "repo": "https://hg.mozilla.org/users/raliiev_mozilla.com/tools", - "revision": "default", + "revision": "FIREFOX_47_0_3", "dest": "tools", "vcs": "hg", }, hg copy testing/mozharness/configs/single_locale/mozilla-release.py testing/mozharness/configs/single_locale/jamun.py # to make release sanity happy This should make the bumper use the branch instead of default. I'm waiting for the builds to test release promotion on jamun.

Comment on attachment 8800689 [details] Bug 1309894 - Use dev-* update channels on jamun. https://reviewboard.mozilla.org/r/85576/#review87208

Comment on attachment 8800689 [details] Bug 1309894 - Use dev-* update channels on jamun. https://hg.mozilla.org/build/buildbot-configs/rev/d65e81712d2c22ce0c44cf9e75fc0c1d4efe4945

In production: https://hg.mozilla.org/build/buildbot-configs/rev/d65e81712d2c

s/dev-*/*-dev/

Comment on attachment 8804291 [details] [diff] [review] release-dev.diff https://hg.mozilla.org/build/buildbot-configs/rev/c3ba8bc05df62bc47c6f825dcd6b4d595a05dc49

In production: https://hg.mozilla.org/build/buildbot-configs/rev/c3ba8bc05df6

So far the testing looking good, I've got a proper push http://hg.mozilla.org/users/raliiev_mozilla.com/tools/rev/5dda5fd2d29b and tags http://hg.mozilla.org/users/raliiev_mozilla.com/tools/rev/9f76967ddbf7 in the FIREFOX_47_0_3 branch. Waiting for FIREFOX_47_0_5 builds to test builds off of a relbranch.

If It Works (TM) we should follow this steps to enable multi-branch releases on mozilla-release: 1) set "watch_all_branches" to True for mozilla-release in mozilla/config.py (buildbot-configs), merge, reconfig. This will enable builds on *every push*, including pushes generated by Fennec and Thunderbird release branching/tagging. CI builds will appear linearly in Treeherder. 2) Create a branch in the tools repo for the smallest version (eg 47.0.x). Something like this: hg clone ssh://hg.mozilla.org/build/tools cd tools hg up FIREFOX_47_0_1_RELEASE_RUNTIME # to switch to latest patcher configs hg branch FIREFOX_47_0_2 hg commit -m "Bug xxx: create FIREFOX_47_0_2 branch" hg push --new-branch 3) create a new named branch in mozilla-release based on 47.0.1 hg clone release cd mozilla-release hg up FIREFOX_47_0_1_RELEASE hg branch FIREFOX_47_0_2_RELBRANCH # update the tools repo's revision in testing/mozharness/configs/releases/updates_firefox_release.py, set it to FIREFOX_47_0_2 (created in step 2), similar to https://hg.mozilla.org/projects/jamun/rev/0f2781b2d7d2f97ac1855accae725ad223243167 # bump version in browser/config/version.txt, browser/config/version_display.txt, and config/milestone.txt hg commit hg push -r . --new-branch release

Good news: the patcher config bumper worked fine http://hg.mozilla.org/users/raliiev_mozilla.com/tools/rev/22af0e10cf36 Bad news: the l10n script updates to default and fails to fetch en-US because the versions don't match. Looking into this now.

Looks like we need https://hg.mozilla.org/mozilla-central/rev/e879961960ee grafted to 47.x

... and replace "default" with "%(revision)s" in single_locale configs

updated instructions: 1) set "watch_all_branches" to True for mozilla-release in mozilla/config.py (buildbot-configs), merge, reconfig. This will enable builds on *every push*, *excluding* DONTBUILD pushes generated by Fennec and Thunderbird release branching/tagging. CI builds will appear linearly in Treeherder. 2) Create a branch in the tools repo for the smallest version (eg 47.0.x). Something like this: hg clone ssh://hg.mozilla.org/build/tools cd tools hg up FIREFOX_47_0_1_RELEASE_RUNTIME # to switch to latest patcher configs hg branch FIREFOX_47_0_2 hg commit -m "Bug xxx: create FIREFOX_47_0_2 branch" hg push --new-branch 3) create a new named branch in mozilla-release based on 47.0.1 hg clone release cd mozilla-release hg up FIREFOX_47_0_1_RELEASE hg branch FIREFOX_47_0_2_RELBRANCH # graft revs required by l10n hg graft e879961960ee hg graft 5e0c246f9a60 # update the tools repo's revision in testing/mozharness/configs/releases/updates_firefox_release.py, set it to FIREFOX_47_0_2 (created in step 2), similar to https://gist.github.com/rail/a8edf02fd25f3f5e5d53f30fe10f4592 # bump version in browser/config/version.txt, browser/config/version_display.txt, and config/milestone.txt hg commit hg push -r . --new-branch release

One more thing: the version bump task happens on default, need to tweak testing/mozharness/configs/releases/postrelease_firefox_release.py similar to https://gist.github.com/rail/83f65b1cb7ba01ace0f003fda77fd157

updated instructions: 1) set "watch_all_branches" to True for mozilla-release in mozilla/config.py (buildbot-configs), merge, reconfig. This will enable builds on *every push*, *excluding* DONTBUILD pushes generated by Fennec and Thunderbird release branching/tagging. CI builds will appear linearly in Treeherder. 2) Create a branch in the tools repo for the smallest version (eg 47.0.x). Something like this: hg clone ssh://hg.mozilla.org/build/tools cd tools hg up FIREFOX_47_0_1_RELEASE_RUNTIME # to switch to latest patcher configs hg branch FIREFOX_47_0_2 hg commit -m "Bug xxx: create FIREFOX_47_0_2 branch" hg push --new-branch 3) create a new named branch in mozilla-release based on 47.0.1 hg clone release cd mozilla-release hg up FIREFOX_47_0_1_RELEASE hg branch FIREFOX_47_0_2_RELBRANCH # graft revs required by l10n hg graft e879961960ee hg graft 5e0c246f9a60 # update the tools repo's revision in testing/mozharness/configs/releases/updates_firefox_release.py, set it to FIREFOX_47_0_2 (created in step 2), similar to https://gist.github.com/rail/a8edf02fd25f3f5e5d53f30fe10f4592 # tweak revision in testing/mozharness/configs/releases/postrelease_firefox_release.py similar to https://gist.github.com/rail/83f65b1cb7ba01ace0f003fda77fd157 # bump version in browser/config/version.txt, browser/config/version_display.txt, and config/milestone.txt hg commit hg push -r . --new-branch release