The default bug view has changed. See this FAQ.

Move some android and b2g manifest configs out of mozharness and into the tree

RESOLVED FIXED

Status

Release Engineering
Mozharness
RESOLVED FIXED
3 years ago
3 years ago

People

(Reporter: ahal, Assigned: ahal)

Tracking

unspecified
All
Android
Dependency tree / graph

Firefox Tracking Flags

(firefox34 fixed, firefox35 fixed, b2g-v2.1 fixed, b2g-v2.2 fixed)

Details

Attachments

(2 attachments)

These are still defined in mozharness, they should live in-tree under testing/config/mozharness.
Blocks: 1067535
Summary: Move android arm/x86 xpcshell manifest config out of mozharness and into the tree → Move android and b2g xpcshell manifest config out of mozharness and into the tree
Created attachment 8489636 [details] [diff] [review]
Make in-tree configs supercede extra_args for android

The idea of this patch is to only append the 'extra_args' to the command (which are defined in mozharness) if the option hasn't already been defined by in-tree configs. This allows us to use the config in mozharness for older branches, while letting the in-tree versions ride the train.

In order to do this, I had to assume all 'extra_args' were of the form ['--foo=bar'] instead of ['--foo', 'bar']. This might not be a great assumption to make, but I justify it in the knowledge that we eventually want all 'extra_args' in-tree.
Attachment #8489636 - Flags: review?(cmanchester)
Created attachment 8489637 [details] [diff] [review]
(m-c) Define b2g/android manifests in in-tree config

This is a patch against m-c that makes some of the configs in mozharness obsolete (from Gecko 35 onwards).
Attachment #8489637 - Flags: review?(cmanchester)
The previous two patches are being tested on Ash:
https://tbpl.mozilla.org/?tree=Ash&rev=899dc596b794
Comment on attachment 8489636 [details] [diff] [review]
Make in-tree configs supercede extra_args for android

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

::: scripts/android_emulator_unittest.py
@@ +413,5 @@
> +            argname = arg.split('=')[0]
> +            # only add the extra arg if it wasn't already defined by in-tree configs
> +            if any(a.split('=')[0] == argname for a in cmd):
> +                continue
> +            cmd.append(arg)

This is sort of too bad but I guess there isn't any other way.
Attachment #8489636 - Flags: review?(cmanchester) → review+
Comment on attachment 8489637 [details] [diff] [review]
(m-c) Define b2g/android manifests in in-tree config

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

::: testing/config/mozharness/b2g_emulator_config.py
@@ +9,5 @@
>          "--remote-webserver=%(remote_webserver)s", "--ignore-window-size",
>          "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s",
>          "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s",
>          "--extra-profile-file=jsreftest/tests/user.js",
> +        "jsreftest/tests/jstests.list",

Might update the bug summary to reflect this isn't an xpcshell only change.
Attachment #8489637 - Flags: review?(cmanchester) → review+
I don't see anything suspicious in that Ash run:
https://hg.mozilla.org/build/mozharness/rev/707df471ab2c

Here's a cypress run to keep an eye on, just in case:
https://tbpl.mozilla.org/?tree=Cypress&rev=27253887d2cc
Summary: Move android and b2g xpcshell manifest config out of mozharness and into the tree → Move some android and b2g manifest configs out of mozharness and into the tree
Attachment #8489636 - Flags: checked-in+
In prod with reconfig on 2014-09-22 08:20 PT
Comment on attachment 8489637 [details] [diff] [review]
(m-c) Define b2g/android manifests in in-tree config

Try run looks good:
https://hg.mozilla.org/integration/mozilla-inbound/rev/f41dc09ee34b
Attachment #8489637 - Flags: checked-in+
https://hg.mozilla.org/mozilla-central/rev/f41dc09ee34b
Status: ASSIGNED → RESOLVED
Last Resolved: 3 years ago
Resolution: --- → FIXED
https://hg.mozilla.org/releases/mozilla-aurora/rev/61f812b1c934
status-b2g-v2.1: --- → fixed
status-b2g-v2.2: --- → fixed
status-firefox34: --- → fixed
status-firefox35: --- → fixed
You need to log in before you can comment on or make changes to this bug.