842868 - Tracking bug for 17-sep-2013 migration work

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

Instructions: https://wiki.mozilla.org/ReleaseEngineering:MergeDuty

Comment 1

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

Found in triage.

Comment 2

[[e-mail] (:bhearsum)]

This is not release work - migration bugs track config.py migrations.

Comment 3

[Nick Thomas [:nthomas] (UTC+12)]

Attachment: [buildbot-configs] beta -> release merge

Comment 4

[Rail Aliiev [:rail]]

Comment on attachment 801895 [details] [diff] [review]
[buildbot-configs] beta -> release merge

Can you also remove http://hg.mozilla.org/build/buildbot-configs/file/79461395d3b3/mozilla-tests/config.py#l1455 to make sure that the last beta is in sync with release?

Comment 5

[Nick Thomas [:nthomas] (UTC+12)]

Landed with the extra change:
https://hg.mozilla.org/build/buildbot-configs/rev/f5fd82ba7a08

Comment 6

[Nick Thomas [:nthomas] (UTC+12)]

In production

Comment 7

[Armen [:armenzg]]

Attachment: merge.diff

Comment 8

[Aki Sasaki (not active)]

Attachment: b2g merge day

Comment 9

[Armen [:armenzg]]

Attachment: adjust b2g comments

Comment 10

[Rail Aliiev [:rail]]

Comment on attachment 805421 [details] [diff] [review]
merge.diff

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

::: mozilla/b2g_config.py
@@ +1133,5 @@
>  BRANCHES['try']['platforms']['emulator-jb-debug']['slaves'] = TRY_SLAVES['mock']
>  BRANCHES['try']['platforms']['emulator-jb-debug']['mozharness_config']['extra_args'] = ['--target', 'generic', '--config', 'b2g/releng-try.py', '--b2g-config-dir', 'emulator-jb', '--debug', '--gaia-languages-file', 'locales/languages_dev.json', '--gecko-languages-file', 'gecko/b2g/locales/all-locales']
>  
>  
> +# TODO: move the block below to above the BRANCHES['mozilla-central']

Some of the comment changes in this file fail to apply. Otherwise it looks good.

Feel free to edit the comments in the final patch.

Comment 11

[Aki Sasaki (not active)]

Comment on attachment 805422 [details] [diff] [review]
b2g merge day

https://hg.mozilla.org/build/buildbot-configs/rev/7747201fd40c

Comment 12

[Armen [:armenzg]]

Comment on attachment 805421 [details] [diff] [review]
merge.diff

https://hg.mozilla.org/build/buildbot-configs/rev/aa4a42b4885e

Comment 13

[Armen [:armenzg]]

Only the beta bundle builders have been triggered ("mozilla-beta hg bundle" and "comm-beta hg bundle"):
"Beta is now Firefox 25. Aurora remains Firefox 25 (and Nightly 26) until we figure out bug 916757 and open up m-c, and which changeset can be uplifted to mozilla-aurora. As things stand with the investigation, this may not happen today. No impact to Beta/Release timelines though."

We will trigger the rest once dev.planning says that we're moving forward with the merges.

Comment 14

[Armen [:armenzg]]

Triggering mozilla-release as well since it has the right version:
http://hg.mozilla.org/releases/mozilla-release/raw-file/default/browser/config/version.txt == 24.0

Comment 15

[Armen [:armenzg]]

Triggering mozilla-aurora's bundle generation:
http://hg.mozilla.org/releases/mozilla-aurora/raw-file/default/browser/config/version.txt

I also did this:
"When we have nightlies from mozilla-central with the new version, update the bouncer location for firefox-nightly-latest (installer) to use the new version "

Comment 16

[Armen [:armenzg]]

We have not yet re-enabled the aurora updates.

"When re-enable updates for Aurora, update the bouncer locations for firefox-aurora-latest (installer) and firefox-aurora-stub (stub installer) to use the new version"

Comment 17

[Rail Aliiev [:rail]]

I updated the aurora bouncer entries as well.

Comment 18

[Armen [:armenzg]]

Thanks!