1223950 - Configure branch name for balrog updates

Status: RESOLVED FIXED

(Taskcluster :: General, defect, P1)

Comment 1

[Wander Lairson Costa]

Attachment: Fix branch name for balrog publishing. r=nthomas

Comment 2

[Wander Lairson Costa]

Comment on attachment 8686308 [details] [diff] [review]
Fix branch name for balrog publishing. r=nthomas

Try:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=b5e7f44b8037

OTA Build:
https://tools.taskcluster.net/task-inspector/#WXKPDL1EQvuxpL2pHuF5uQ/

Comment 3

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

Comment on attachment 8686308 [details] [diff] [review]
Fix branch name for balrog publishing. r=nthomas

Lets land this for the immediate situation, I don't think it can hurt any other jobs from looking at the code.

Probably we should follow up so that query_branch() is a little different. AIUI configuration given as args like --branch should have the highest precedence, and this change leaves config['branch'] in the middle. It may be preferable to echo to another config file in build-phone-ota.sh, and pass that with -c to avoid the --branch arg altogether. I'm going to defer to jlund on this as our mozharness expert.

Comment 4

[Pulsebot]

https://hg.mozilla.org/integration/b2g-inbound/rev/6271ec21093c

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/6271ec21093c

Comment 6

[Jordan Lund (:jlund)]

(In reply to Nick Thomas [:nthomas] from comment #3)

> AIUI configuration given as args like --branch should have the highest
> precedence, and this change leaves config['branch'] in the middle. 

I'm being slow, what do you mean "leaves config['branch'] in the middle"? Do we define config["branch"] in mh b2g build configs elsewhere and this explicitly passed arg (--branch) is overriding that? If we don't have "branch" in any mh configs, this approach should be okay.

in desktop build world, we pass branch via --branch. Though I guess we could adopt a new approach, now that mh is in gecko, where 'branch' is set in a mh config and holds its own value depending on the gecko repo. The downside there is we would need to add more complexity to our merge scripts iiuc.

Comment 7

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

It's the difference between desktop where --branch is the primary mechanism, and b2g where we first look to the buildbot properties, then --branch, then infer it from the repo name. Here's the code on the current tip for that:
  https://hg.mozilla.org/mozilla-central/file/1d6155d7e6c9/testing/mozharness/scripts/b2g_build.py#l204

If that's fine then I won't press the issue.