983262 - Remove b2g.json, b2g-desktop.json and b2g-debug.json from the tree

Status: RESOLVED FIXED

(Testing :: Mochitest, defect)

Description

[Andrew Halberstadt [:ahal]]

Now that these files are empty, let's remove them. I filed a separate bug for this because it requires a change to mozharness before we can do it.

Comment 1

[Andrew Halberstadt [:ahal]]

Attachment: Ignore non-existent manifests

This patch should let us delete the .json files without needing to worry about older branches breaking. I'll test it out on ash before asking for review.

Comment 2

[Andrew Halberstadt [:ahal]]

Results should show up here:
https://tbpl.mozilla.org/?tree=Ash&rev=e5dcef93a33d

Comment 3

[Andrew Halberstadt [:ahal]]

Attachment: Ignore non-existent manifests

The last patch used 'log_level' instead of 'level'. That seemed to be the only problem, and this patch addresses it.

Comment 4

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

Comment on attachment 8392912 [details] [diff] [review]
Ignore non-existent manifests

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

one question below, everything else looks fine

::: configs/b2g/desktop_automation_config.py
@@ +41,5 @@
>          "reftest": "runreftestb2g.py",
>      },
>  
>      "mochitest_options": [
> +        "--console-level=INFO", "%(test_manifest)s",

why isn't this --manifest=%(test_manifest)s ?

Comment 5

[Andrew Halberstadt [:ahal]]

Because on older branches it still needs to be --test-manifest=%(test_manifest)s. So in the mozharness script we substitute the entire option depending on whether a .ini or a .json manifest is passed in.

Comment 6

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

that doesn't answer my question, you are now removing the cli option completely and just putting in %(test_manifest)s

Comment 7

[Andrew Halberstadt [:ahal]]

%(test_manifest)s will either be substituted with the string "--test-manifest=path/to/b2g.json" or "--manifest=path/to/mochitest.ini".

Comment 8

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

got it!

Comment 9

[Andrew Halberstadt [:ahal]]

https://hg.mozilla.org/build/mozharness/rev/cf177becec76

Comment 10

[Andrew Halberstadt [:ahal]]

Attachment: Remove json manifests

This needs to wait for the previous patch to get merged to production.

Comment 11

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

Comment on attachment 8393048 [details] [diff] [review]
Remove json manifests

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

sold!

Comment 12

[Andrew Halberstadt [:ahal]]

Attachment: Remove json manifests

Bah, sorry.. I was a bit pre-mature uploading that last patch. I forgot to remove them from both the Makefile.in and the mach target.

Comment 13

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

Comment on attachment 8393052 [details] [diff] [review]
Remove json manifests

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

that looks a lot better, good catch.

Comment 14

[Armen [:armenzg]]

Live in production.

Comment 15

[Andrew Halberstadt [:ahal]]

https://hg.mozilla.org/integration/b2g-inbound/rev/2e7909fc6c8a

Comment 16

[Andrew Halberstadt [:ahal]]

Attachment: (mozharness) fix bustage

Bah, my mozharness patch has an error and is breaking mochitests on b2g28.

This should fix it, though it's not possible to test without just pushing live and hoping.

Comment 17

[Andrew Halberstadt [:ahal]]

https://hg.mozilla.org/build/mozharness/rev/f33fc282295b

Comment 18

[Andrew Halberstadt [:ahal]]

Live in production.

Comment 19

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/2e7909fc6c8a