Closed Bug 983262 Opened 6 years ago Closed 6 years ago

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

Categories

(Testing :: Mochitest, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla31

People

(Reporter: ahal, Assigned: ahal)

References

Details

(Whiteboard: [mozharness])

Attachments

(3 files, 2 obsolete files)

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.
Attached patch Ignore non-existent manifests (obsolete) — Splinter Review
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.
The last patch used 'log_level' instead of 'level'. That seemed to be the only problem, and this patch addresses it.
Attachment #8390664 - Attachment is obsolete: true
Attachment #8392912 - Flags: review?(jmaher)
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 ?
Attachment #8392912 - Flags: review?(jmaher) → review+
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.
that doesn't answer my question, you are now removing the cli option completely and just putting in %(test_manifest)s
%(test_manifest)s will either be substituted with the string "--test-manifest=path/to/b2g.json" or "--manifest=path/to/mochitest.ini".
Attached patch Remove json manifests (obsolete) — Splinter Review
This needs to wait for the previous patch to get merged to production.
Attachment #8393048 - Flags: review?(jmaher)
Comment on attachment 8393048 [details] [diff] [review]
Remove json manifests

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

sold!
Attachment #8393048 - Flags: review?(jmaher) → review+
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.
Attachment #8393048 - Attachment is obsolete: true
Attachment #8393052 - Flags: review?(jmaher)
Comment on attachment 8393052 [details] [diff] [review]
Remove json manifests

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

that looks a lot better, good catch.
Attachment #8393052 - Flags: review?(jmaher) → review+
Live in production.
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.
Attachment #8393796 - Flags: review?(jgriffin)
Attachment #8393796 - Flags: review?(jgriffin) → review+
Live in production.
https://hg.mozilla.org/mozilla-central/rev/2e7909fc6c8a
Status: ASSIGNED → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla31
You need to log in before you can comment on or make changes to this bug.