709979 - Set the branch property for projects/addon-sdk jobs to just addon-sdk

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Phil Ringnalda (:philor)]

Attachment: utterly untested fix v.1

Everything else that has a repo in projects/ or releases/ or integration/ sets its branch property to just the bit after that. Then tbpl looks for things in builds-4hr.js.gz with a branch matching its buildbotBranch property for some tree, which is set to the final bit for everything including the Jetpack tree, because that's what we expected to see. As a result, https://tbpl.mozilla.org/?tree=Jetpack (the buildbot-based version) doesn't ever show anything other than pending jobs, because there's nothing in builds-4hr.js.gz with branch = "addon-sdk", only things with branch = "projects/addon-sdk".

tbpl could work around that, but it seems like the sort of thing that will wind up biting something else, and that we might as well fix if there isn't some reason for having it that way.

Not sure where that happens for other things, but for Nanojit and SpiderMonkey, conveniently right above generateJetpackObjects, it happens by setting it to os.path.basename(config['repo_path']), so this *totally untested don't trust me I don't know what I'm doing you really have to review it* patch copy-pastes that.

Comment 1

[Lukas Blakk [:lsblakk] use ?needinfo]

It looks good to me and matches the (desired) behaviour in the other two Project-type branches.

Comment 2

[Phil Ringnalda (:philor)]

Comment on attachment 581065 [details] [diff] [review]
utterly untested fix v.1

http://hg.mozilla.org/build/buildbotcustom/rev/eee5468ff6d3

Comment 3

[Chris Cooper [:coop] (he/him)]

I reconfig-ed with the landed changes from this bug today.

Comment 4

[Phil Ringnalda (:philor)]

Comment on attachment 581065 [details] [diff] [review]
utterly untested fix v.1

>+    branch = os.path.basename(config['repo_path'])
>     for branch in config['branches']:

Even by my standards of obliviousness, that was pretty oblivious of me. The magic doesn't happen by magic, it happens by the bit creating the builder object including a "'properties': {'branch': branch}," in it, so what I should have done was set, um, project_branch and then shoved that into the builder as branch.

Comment 5

[Lukas Blakk [:lsblakk] use ?needinfo]

landed a 'bustage fix' http://hg.mozilla.org/build/buildbotcustom/rev/b6820e340957

Comment 6

[Phil Ringnalda (:philor)]

That caught a reconfig this morning, and now https://tbpl.mozilla.org/?tree=Jetpack can see things.