715966 - branch 1.9.2 confusingly set on talos tbpl logs

Status: RESOLVED FIXED

(Release Engineering :: General, enhancement, P5)

Description

[Jeff Hammel]

A typical mozilla-inbound push uses PerfConfigurator like:

argv: ['python', 'PerfConfigurator.py', '-v', '-e',
 '../firefox/firefox-bin', '-t', 'talos-r3-fed-071', '-b', '1.9.2',
 '--branchName', 'Firefox-Non-PGO', '--resultsServer',
 'graphs-old.mozilla.org', '--resultsLink', '/server/collect.cgi',
 '--activeTests', 'tp5', '--mozAfterPaint', '--responsiveness',
 '--symbolsPath', '../symbols']

I guess we use --branchName? but -b 1.9.2 is certainly wrong and misleading and should be removed.

Comment 1

[Armen [:armenzg]]

What is the difference between -b and --branchName?

The code lives in here:
http://hg.mozilla.org/build/buildbotcustom/file/tip/steps/talos.py#l77

    77         self.setCommand(["python", perfconfigurator, "-v", "-e", exePath,
    78             "-t", title, "-b", self.branch,
    79             '--branchName', self.branchName] + self.addOptions)

and in process/factory.py:

    def addUpdateConfigStep(self):
        self.addStep(talos_steps.MozillaUpdateConfig(
         workdir=os.path.join(self.workdirBase, "talos/"),
         branch=self.buildBranch,
         branchName=self.talosBranch,

I can see that mozilla-central has it wrong:
BRANCHES['mozilla-central']['build_branch'] = "1.9.2"
all other branches do this:
 BRANCHES[branch]['build_branch'] = branchConfig.get('build_branch', branch.title())

BTW a typical PerfConfigurator call for inbound is like this (to compare with comment 0 which is for m-c):
python PerfConfigurator.py -v -e ../firefox/firefox-bin -t talos-r3-fed64-069 -b Mozilla-Inbound --branchName Mozilla-Inbound-Non-PGO --resultsServer graphs-old.mozilla.org --resultsLink /server/collect.cgi --activeTests tscroll:a11y:ts_paint:tpaint:tdhtml:tsspider --mozAfterPaint --symbolsPath ../symbols

Comment 2

[Joel Maher ( :jmaher ) (UTC -8)]

-b is for branch
--branchName is the text for the branch

oddly enough I don't think either is used

Comment 3

[Joel Maher ( :jmaher ) (UTC -8)]

ok, we use --branchName, but not branch (-b).  Maybe we should scrap the use of -b?

Comment 4

[Armen [:armenzg]]

Attachment: (not tested yet) remove the usage of -b

Comment 5

[Joel Maher ( :jmaher ) (UTC -8)]

Comment on attachment 590192 [details] [diff] [review]
(not tested yet) remove the usage of -b

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

looks good.  should this be done on mobile also?

Comment 6

[Armen [:armenzg]]

This is working on staging.

Which piece of code are you referring to?

Comment 7

[Armen [:armenzg]]

Comment on attachment 590192 [details] [diff] [review]
(not tested yet) remove the usage of -b

http://hg.mozilla.org/build/buildbotcustom/rev/460691fec2b5

Comment 8

[[e-mail] (:bhearsum)]

This landed in production today.