985546 - B2G desktop builds with git tryserver syntax in gaia.json

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Jonathan Griffin (:jgriffin)]

When someone uses the git tryserver syntax in gaia.json and specified a revision (instead of a branch), the B2G desktop build jobs fail because they pick up the git commit and try to use it to clone from gaia-central.

The build jobs should just ignore the git tryserver syntax, since the gaia test jobs clone their own gaia.

Example:

https://hg.mozilla.org/try/rev/6deb2175a4a9

leads to this in the log:

{
    "git": {
        "remote": "https://github.com/kevingrandon/gaia.git", 
        "branch": "bug_967516_enable_device_debug_default", 
        "revision": "c1d77100e693a4df0215a6b05940fd7d692eb275"
    }, 
    "revision": "ca4f67df676ef3ab0072b9e3fb97baee4d4bde36", 
    "repo_path": "/integration/gaia-central"
}
program finished with exit code 0
elapsedTime=0.002286
gaiaRepoPath: '/integration/gaia-central'
gaiaRevision: 'c1d77100e693a4df0215a6b05940fd7d692eb275'

It should be using a revision of ca4f67df676ef3ab0072b9e3fb97baee4d4bde36, rather than c1d77100e693a4df0215a6b05940fd7d692eb275.

Comment 1

[Jonathan Griffin (:jgriffin)]

link to full log: https://tbpl.mozilla.org/php/getParsedLog.php?id=36379331&tree=Try&full=1#error0

Comment 2

[Jonathan Griffin (:jgriffin)]

This comes from:  http://hg.mozilla.org/build/buildbotcustom/file/8de255d9e176/process/factory.py#l1203

We're doing a regex on the JSON file instead of parsing the JSON; apparently this caused a crash in the past, which seems odd...maybe we can try doing it the right way again.  Unfortunately, I have no way to test changes to this code.

Alternately, we could attempt to make the regex smarter, or change the git try attribute name for 'revision'.  Aki, any opinions?

Comment 3

[Aki Sasaki (not active)]

I would like to do this the right way (json parsing), but practically I think buildbot will make this harder/more time consuming than it should be.  Without knowing details about the git try stuff, I think the easiest solution would be to change the git "revision" to "git_revision" or something... which I would guess would require

* renaming here: http://hg.mozilla.org/build/mozharness/file/9876018e8c38/scripts/b2g_bumper.py#l338
* updating whatever uses that file for gaia try
* updating any docs

Comment 4

[Aki Sasaki (not active)]

Hm, evidently http://hg.mozilla.org/build/mozharness/file/9876018e8c38/scripts/bump_gaia_json.py#l164 as well until b2g_bumper is run on all branches.

Comment 5

[Jonathan Griffin (:jgriffin)]

Ok, I'll handle it in mozharness and docs.

Comment 6

[Jonathan Griffin (:jgriffin)]

Attachment: Use git_revision in gaia.json's git dict,

I'll need to update the docs after this lands.

Comment 7

[Jonathan Griffin (:jgriffin)]

Comment on attachment 8396630 [details] [diff] [review]
Use git_revision in gaia.json's git dict,

https://hg.mozilla.org/build/mozharness/rev/697e4c1601f1

Comment 8

[Jonathan Griffin (:jgriffin)]

in production

Comment 9

[Jonathan Griffin (:jgriffin)]

here's a try run to test this: https://tbpl.mozilla.org/?tree=Try&rev=c1c8ad5a0226

Comment 10

[Jonathan Griffin (:jgriffin)]

try is good and docs have been updated!