Commit Graph

191 Commits

Author SHA1 Message Date
Greg Mierzwinski
091ab435b5 Bug 1336813 - Use transform for the run-on-projects flag in linux64-jsdcov. r=jmaher
This patch enables the use of the transform 'enable_code_coverage' to set the 'run-on-projects' for all test suites used by linux64-jsdcov. It also removes the occurences of that flag from the test definition yaml.

MozReview-Commit-ID: 66zG9MrFn2i

--HG--
extra : rebase_source : 7d2b16c5c4c0c6d8c931f7f344db745432b92412
2017-02-05 11:35:18 -05:00
Wander Lairson Costa
5e9e6df1fa Bug 1336427: add try option to run tc-worker jobs. r=dustin
-w, --taskcluster-worker: schedule taskcluster-worker jobs.

This is necessary to relieve the load of the small pool of data center
machines.

MozReview-Commit-ID: IiOLHUs2ALi

--HG--
extra : rebase_source : 96acbbd40aef856f68c7ab94ae23bcee4f2f078d
2017-02-03 16:38:51 -02:00
Dustin J. Mitchell
53b7bc583c Bug 1334167: allow by-project for cron jobs' when property; r=Callek
This requires moving the schema utilities to their own util module.

MozReview-Commit-ID: KR5xSJ9ak5Y

--HG--
extra : rebase_source : 1c1f6bfb6a08deb8c0be4b2b58db02d85aafeb89
2017-02-01 00:30:52 +00:00
Wander Lairson Costa
56c96fa18d Bug 1333167: Add extra try options to taskcluster. r=dustin a=jmaher
We add the following command line options to Taskcluster try syntax:

--spsProfile - enable profile mode.
--rebuild-talos <N> - retrigger talos tests N times.
--setenv <VAR>=<val> - add extra environments variables.
--tag <TAG> - run tests only the tag TAG.
--no-retry - doesn't retry failed jobs.

We have a chicken-egg problem, as we first generate the full task graph
and then parse the try message. But the graph generation step needs to
know the try message to process the aforementioned options. The
solution is to parse the message before graph generation and then
pass the command line options to the transforms. Then, each transform
can look at the option that interests it and process it accordingly.

The message parse function is configured in kind.yml, which gives some
flexibility for future implementations of alternative syntaxes.

MozReview-Commit-ID: GPFdi0FD6Vn

--HG--
extra : rebase_source : b992786158851f1099aedfce8669a163228edc51
2017-02-02 09:34:43 -02:00
Wander Lairson Costa
0ad3cf17fa Bug 1334829 - Enable native-engine jobs only on try. r=dustin
--HG--
extra : rebase_source : ffabf4926e92e17557f4265cb6b457950ec4edc1
2017-01-31 12:42:00 -05:00
Kim Moir
44d6d6f60d Bug 1333155 - convert buildbot addon devel Linux64 builds to taskcluster r=mtabara 2017-01-31 10:55:44 -05:00
Wes Kocher
e457683b2d Merge m-c to autoland, a=merge
MozReview-Commit-ID: BipzgOEInZh
2017-01-30 15:54:34 -08:00
Wes Kocher
584127af5f Merge inbound to central, a=merge
MozReview-Commit-ID: 4GYZ5Pzy7BY
2017-01-30 15:44:58 -08:00
Mitchell Hentges
591e9ae130 Bug 1334402 - Don't use sccache in taskcluster builds r=gmierz,jmaher+560562
MozReview-Commit-ID: JDldupP7fZN

--HG--
extra : rebase_source : f05581ab576ab31d9e3b8f00d6d0ca3e4a819655
2017-01-27 00:21:32 -08:00
Benjamin Smedberg
2487f35654 Bug 1333826 - Remove SDK references from taskcluster beetmover, r=jlund
MozReview-Commit-ID: SG7l2zAxCQ

--HG--
extra : rebase_source : a0e294ab41938cba2a3177f027d0584c4b45a996
2017-01-27 08:45:18 -05:00
Justin Wood
68461e41af Bug 1333531 - chunkify.chunkify breaks if less locales are in all-locales than chunks in decision task. r=aki
MozReview-Commit-ID: Hr7KgyHIMlc

--HG--
extra : rebase_source : f54b096d7885ccd05a0a4dbc1130dc76bb32755e
2017-01-27 15:47:30 -05:00
Wander Lairson Costa
69c4be1e9f Bug 1334829: Only run native-engine jobs from try branch. r=dustin
The 20 machines pool running taskcluster-worker is not enough to run
jobs from all branches. Let's limit these jobs to try branch while they
are tier 3.

MozReview-Commit-ID: KmkUjPp7NHL

--HG--
extra : rebase_source : 74303836d9b6550553f1b8a3a3bdbe05b893a573
2017-01-29 07:55:52 -02:00
Wes Kocher
26ef67bc84 Merge m-c to autoland, a=merge CLOSED TREE
MozReview-Commit-ID: 86aFtkvKHHj
2017-01-25 17:18:56 -08:00
Greg Mierzwinski
4e8738494d Bug 1301978 - Enable reftest, crashtest, & jsreftest and use a transform on linux64-ccov tasks. r=jmaher
This bug makes it simpler to add new test suites to linux64-ccov with the help of a new transform and also cleans up the test suite definitions. It also enables reftest, crashtest and jsreftest at the same time.

MozReview-Commit-ID: xCjKhUlfts

--HG--
extra : rebase_source : 6f1b34212913cf5d7f93390d7fd47c179577a604
2017-01-22 16:33:10 -07:00
Andrew Halberstadt
7c0ca34fd5 Bug 1333424 - Implicitly add relevant taskcluster configuration files to 'files-changed' attribute, r=dustin
This will ensure that if the taskgraph module, taskcluster configs related to a task or docker image related
to a task are modified, the task will run.

MozReview-Commit-ID: 1H6LnYsxxpc

--HG--
extra : rebase_source : 51aae8aa445be83f64d0a381cee01a0b5861b41a
2017-01-24 10:42:45 -05:00
Phil Ringnalda
c61fdd722f Bug 1332255 followup, placate flake8 with random blank lines
MozReview-Commit-ID: KvK35LrGvXm

--HG--
extra : rebase_source : a9b39945a0415eb3155bb8b700d2b3d260c1801c
2017-01-23 21:08:43 -08:00
Wander Lairson Costa
d63bdf19ad Bug 1332255 - [followup] fix buildername for linux64-pgo talos. r=dustin
For correct platform name in TH, the buildername must contain the pgo
string in the buildername. We work a bit more generic by matching any
build variant.
2017-01-23 14:14:00 -05:00
Justin Wood
85530ff049 Bug 1332407 - TC based nightlies should have en-US and "multi locale" routes as well. r=dustin
MozReview-Commit-ID: KwVqrYFfDUD

--HG--
extra : rebase_source : ee10d7d4c113677a12fef81f7b53676a6fcb43df
2017-01-19 14:25:35 -05:00
Wes Kocher
656a71a520 Merge m-c to autoland, a=merge
MozReview-Commit-ID: 2KR6yXYC2xj
2017-01-18 15:39:12 -08:00
Justin Wood
6ca2360558 Bug 1331986 - Set more nightly stuff as tier 1 too. r=jlund a=Kwierso
MozReview-Commit-ID: DC4KfHM8gG1

--HG--
extra : amend_source : a44e6c1b8660df8e9d7a9d0e2342fa92c5ee281a
2017-01-18 12:43:39 -05:00
Justin Wood
484b7264f4 Bug 1331986 - Set linux and android test tasks previously in buildbot as tier 1. r=jmaher
MozReview-Commit-ID: 5sZ6HBWOg8P
2017-01-18 11:48:18 -05:00
Justin Wood
30fcf167af Bug 1301495 - Taskcluster l10n indexing should match mozharness' l10n indexing. r=dustin a=RyanVM
Adds l10n and nightly indexing, matching (better) what Buildbot is currently doing with these types of tasks
(This patch is against `date`, will be grafted on review for real landing, using autoland)

MozReview-Commit-ID: K0BYwaCm6xL

--HG--
extra : source : b3254f6cc3f6f526ec3877add890d12a8947080c
extra : amend_source : 6f0467058cea9318d0a160ce6e2f76b6a9a5b119
2017-01-09 16:23:04 -05:00
Mihai Tabara
c19ddc4c98 Bug 1330276 - remove unused signing_cert in balrogscript.r=aki
MozReview-Commit-ID: 8KLr7SRAcdK
2017-01-17 23:42:23 +02:00
Wes Kocher
cc67c49950 Backed out changeset 7a27e1371c3e (bug 1301495) for breaking decision tasks a=backout
MozReview-Commit-ID: Gx21fdPIkyy
2017-01-17 13:47:20 -08:00
Justin Wood
b36073aba8 Bug 1301495 - Taskcluster l10n indexing should match mozharness' l10n indexing. r=dustin
Adds l10n and nightly indexing, matching (better) what Buildbot is currently doing with these types of tasks
(This patch is against `date`, will be grafted on review for real landing, using autoland)

MozReview-Commit-ID: K0BYwaCm6xL

--HG--
extra : rebase_source : b3254f6cc3f6f526ec3877add890d12a8947080c
2017-01-09 16:23:04 -05:00
Justin Wood
18aa1bdfa6 Bug 1330668 - Schedule balrog submission tasks. r=dustin a=me
MozReview-Commit-ID: ASBDESDps8G
2017-01-12 21:01:54 -05:00
Justin Wood
670cc01865 Bug 1330668 - Schedule beetmover tasks. r=dustin
ToDo: attribute this cset to changes on date.

MozReview-Commit-ID: 7gl3aLGNWvP

--HG--
extra : rebase_source : dd2736c8f683350655628b3411cea82319f4ddae
2017-01-12 17:45:36 -05:00
Justin Wood
141214294c Bug 1330668 - Add routes used to trigger funsize. r=dustin
Involved work which landed on the date project branch with:
* Bug 1319824, by sfraser@mozilla.com (https://hg.mozilla.org/projects/date/rev/a331041b33da)

MozReview-Commit-ID: 3Ep4ZzSmNCX

--HG--
extra : rebase_source : 3e02f55b2b211139351a2045fb16dcde78df5238
2017-01-12 15:25:43 -05:00
William Lachance
0fe5d82ae1 Bug 1204490 - Add link to treeherder to taskcluster task descriptions r=dustin
MozReview-Commit-ID: BDDPf0nZRRg

--HG--
extra : rebase_source : bb170b934d11f5f4382acdd516f2de64e39a9990
2017-01-13 15:46:43 -05:00
Justin Wood
56e750204e Bug 1330298 - Signing tasks are not setting scopes for the signing format correctly. r=jlund
MozReview-Commit-ID: IAoUaFzoZxo

--HG--
extra : rebase_source : e38edab157948f30ded0a3e9af67cc29a96f3f31
2017-01-11 08:58:03 -05:00
Justin Wood
96df1de3fb Bug 1322041 - Sign nightly l10n jobs. r=dustin
Involved work which landed on the date project branch with:
* Bug 1312000, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/79a2f66ff5c0)
* Bug 1312500, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/6ae07fa4b011)
* Bug 1312585, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/7cf267b61752)
* Bug 1313662, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/92f531d1cd77)
* Bug 1314008, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/bbc7608106c0)
* Bug 1314847, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/4a1231655fbb)
* Bug 1316214, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/edae37481cab,
                                    https://hg.mozilla.org/projects/date/rev/62bd3371e954,
                                    https://hg.mozilla.org/projects/date/rev/2cc558343951)
* Bug 1319189, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/4c33f8ccecf5)


MozReview-Commit-ID: 3hadIi757jn

--HG--
extra : rebase_source : 5ff13afd2f6235a0007aeb7f750d30deeb2db8aa
2016-12-13 11:43:47 -05:00
Justin Wood
7bbcf99803 Bug 1322041 - Add chain of trust to l10n jobs. r=dustin
Involved work which landed on the date project branch with:
* No Bug, by asasaki@mozilla.com (https://hg.mozilla.org/projects/date/rev/b82459a453a6)
* Bug 1326093, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/f64a03d94ac7)

MozReview-Commit-ID: Fmg2nouDedc

--HG--
extra : rebase_source : f5f9266788370e4f39e057841c6d37d50c279577
2016-12-04 16:37:05 -10:00
Justin Wood
a4bdb3af6a Bug 1322041 - Nightly l10n support, and docs. r=dustin
Involved work which landed on the date project branch with:

* No Bug, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/e7af20515b1c,
                               https://hg.mozilla.org/projects/date/rev/d7f0f1c6d564,
                               https://hg.mozilla.org/projects/date/rev/db530d7a4672)
* Bug 1171738, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/a906f6997731,
                                    https://hg.mozilla.org/projects/date/rev/ada87315d4c0,
                                    https://hg.mozilla.org/projects/date/rev/fbee52f145e9,
                                    https://hg.mozilla.org/projects/date/rev/2939b68e59fc)
* Bug 1312000, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/79a2f66ff5c0)
* Bug 1312396, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/dc06c58a5663)
* Bug 1312585, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/7cf267b61752)
* Bug 1316527, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/cc2d9365d9b9)
* Bug 1318068, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/7cb11cb76a09)
* Bug 1326093, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/f64a03d94ac7)

MozReview-Commit-ID: Fhom5OcIWru

--HG--
extra : rebase_source : 4e3c56d72ea7b27a7ad930534be26d19f512fa2b
2017-01-06 09:13:41 -05:00
Justin Wood
5043ed6687 Bug 1322041 - Add Docs for L10n and add locales_file parsing. r=dustin
Involved work which landed on the date project branch with:
* Bug 1312585, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/dc1926812404,
                                    https://hg.mozilla.org/projects/date/rev/7cf267b61752)
* Bug 1171738, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/a906f6997731)
* Bug 1314008, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/bbc7608106c0,
                                    https://hg.mozilla.org/projects/date/rev/a80373508881)

MozReview-Commit-ID: 3MVTRgzLYc0

--HG--
extra : rebase_source : 34d58644f2f11ffcf0e9ed420314ffa7e66f9c6a
2016-12-13 11:06:48 -05:00
Justin Wood
02106e80c9 Bug 1322041 - Add signing support for all nightlies. r=dustin
Involved work which landed on the date project branch with:
* Bug 1277579, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/afd3823c852b,
                                     https://hg.mozilla.org/projects/date/rev/345f83708453,
                                     https://hg.mozilla.org/projects/date/rev/8a3ed233af86,
                                     https://hg.mozilla.org/projects/date/rev/0d737cf8e743,
                                     https://hg.mozilla.org/projects/date/rev/e42b3d606002,
                                     https://hg.mozilla.org/projects/date/rev/c3a160ac642b)
* Bug 1305096, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/2287a2568038)
* Bug 1277579, by dustin@mozilla.com (https://hg.mozilla.org/projects/date/rev/79ceb7fa0589)
* Bug 1306166, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/d3fd1966095d,
                                     https://hg.mozilla.org/projects/date/rev/2f52061c02e6,
                                     https://hg.mozilla.org/projects/date/rev/a9f52549a3c3,
                                     https://hg.mozilla.org/projects/date/rev/f69efa90945a)
* Bug 1314847, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/4a1231655fbb,
                                    https://hg.mozilla.org/projects/date/rev/3cd3a0d32f43)
* Bug 1312000, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/79a2f66ff5c0)
* Bug 1312500, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/6ae07fa4b011)
* Bug 1316214, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/edae37481cab,
                                    https://hg.mozilla.org/projects/date/rev/62bd3371e954)
* Bug 1319189, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/4c33f8ccecf5)
* Bug 1319546, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/70a23d243d2c)
* No Bug, by asasaki@mozilla.com (https://hg.mozilla.org/projects/date/rev/5d8ba3560ae9)
* No Bug, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/37d9733a7174)

MozReview-Commit-ID: K1uOY4HOWPX

--HG--
extra : rebase_source : 567392d5d5ddb5ee638c53221a6e545e7b5f1805
2016-12-21 11:21:06 -05:00
Justin Wood
a330ac85ae Bug 1322041 - Upload nightly symbols. r=dustin
Involved work which landed on the date project branch with (with some minor additions for this patch):
* Bug 1314345, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/adbd9221a567)
* Bug 1313190, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/fc693ad74076)
* Bug 1314073, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/ad53900d1b67, https://hg.mozilla.org/projects/date/rev/9c16a1693a53, https://hg.mozilla.org/projects/date/rev/ebfd2671682b)
* Bug 1319546, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/70a23d243d2c)
* Bug 1323485, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/d5fbcf4aed19)
* Bug 1324763, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/89df88ad61ae)
* No Bug, by Callek@gmail.com (https://hg.mozilla.org/projects/date/rev/3fe8f44c7af6)

MozReview-Commit-ID: LMIp6mc5U7w

--HG--
extra : rebase_source : 2030ff93c66ea0c7bb6134d3fee09efb3be9e8d6
2017-01-04 11:15:34 -05:00
Justin Wood
6ef4a1ecc2 Bug 1322041 - Support android x86, arm; and desktop linux, linux64 nightlies via Taskcluster. Unsigned. r=dustin
Involved work which landed on the date project branch with:
* Bug 1321040, by Callek (https://hg.mozilla.org/projects/date/rev/625e2238eddb)
* Bug 1319546, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/70a23d243d2c, https://hg.mozilla.org/projects/date/rev/01e3de270a4f)
* Bug 1277579, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/c3a160ac642b, https://hg.mozilla.org/projects/date/rev/40ee5ff8fad8, https://hg.mozilla.org/projects/date/rev/ec159b8dba7f, https://hg.mozilla.org/projects/date/rev/afd3823c852b)
* Bug 1306166, by kmoir@mozilla.com (https://hg.mozilla.org/projects/date/rev/ff2e467cc345)

MozReview-Commit-ID: 8aZr6TqjRMR

--HG--
extra : rebase_source : bbb894ce57ef1ded707176561bd3ca9dc10ca04e
2016-12-04 17:18:03 -05:00
Wes Kocher
0f254a30d6 Merge inbound to central, a=merge
MozReview-Commit-ID: 1ij6nLf8f8s
2017-01-05 17:30:35 -08:00
Dustin J. Mitchell
47dccff324 Bug 1326547: require that regexps in by-* match entire string; r=Callek
MozReview-Commit-ID: GxVAGHtCrzf

--HG--
extra : rebase_source : 8f3e573be44478011931d2579a3df09a11eb6e97
2017-01-03 18:43:48 -05:00
Dustin J. Mitchell
bfbc5f350d Bug 1326547: replace get_keyed_by with resolve_keyed_by; r=Callek
MozReview-Commit-ID: FS1nbVyykXV

--HG--
extra : rebase_source : 6cddb3ecb188f2c9c6dafee98c3b0ed5bfdf1955
2017-01-05 13:42:14 -05:00
Shing Lyu
a6bb0bf37f Bug 1328765 - Enable Talos on linux64-stylo platform. r=heycam
MozReview-Commit-ID: 9jO7oflVSSw

--HG--
extra : rebase_source : 67dcb1d34c40d35f4206cdf98f6da9b7c552d1cf
2017-01-04 17:26:34 +08:00
Ehsan Akhgari
7da8d19514 Bug 1328172 - Support downloading internal resources from tooltool in toolchain-script; r=dustin 2017-01-04 12:25:58 -05:00
Ehsan Akhgari
ed0aa5ac19 Bug 1325723 - Rename Windows clang-cl builds to st-an to make them more consistent with other static analysis builds; r=froydnj,dustin 2017-01-03 22:57:47 -05:00
Wes Kocher
2903c33754 Merge inbound to central, a=merge
MozReview-Commit-ID: 3AlcRAsPF0s
2016-12-28 16:08:44 -08:00
Wander Lairson Costa
642d96f221 Bug 1320756: Disable treeherder reporting for BBB jobs. r=dustin
buildbot-bridge schedules jobs on BB, which already reports to
treeherder.

MozReview-Commit-ID: 5wdMzEpXK9o

--HG--
extra : rebase_source : d544c5ca78e0fd9236060a42a1d33b7c88395ca9
2016-12-28 15:05:29 -02:00
Dustin J. Mitchell
2003b77fec Bug 1302192: fix python lint; a=me
MozReview-Commit-ID: LiCkvZYHBaX
2016-12-28 15:40:47 +00:00
Dustin J. Mitchell
cb6dd785e8 Bug 1302192: combine the android-test and desktop-test kinds into the test kind; r=wcosta r=jmaher
This makes heavy use of by-test-platform to distinguish the various platforms, since Android
mozharness invocations differ substantially from desktop.

MozReview-Commit-ID: GsZFij6VPTf

--HG--
rename : taskcluster/ci/desktop-test/test-platforms.yml => taskcluster/ci/test/test-platforms.yml
rename : taskcluster/ci/desktop-test/test-sets.yml => taskcluster/ci/test/test-sets.yml
rename : taskcluster/ci/desktop-test/tests.yml => taskcluster/ci/test/tests.yml
extra : rebase_source : f1e98bfa3cdf53db7a5348534875f84cccb24397
2016-12-23 22:12:17 +00:00
Dustin J. Mitchell
955d1df32a Bug 1302192: combine desktop_test and android_test transforms; r=wcosta
This combines all of the transforms into a single file, `tests.py`.

It's not quite copy/paste: the transforms have been combined in several cases.
The generated taskgraph does not change with this commit, though.

MozReview-Commit-ID: HA02M8V0SsG

--HG--
rename : taskcluster/taskgraph/transforms/tests/make_task_description.py => taskcluster/taskgraph/transforms/tests.py
extra : rebase_source : aa5979935b0db0871f54be407ca8b83f6715b160
2016-12-23 18:45:35 +00:00
Dustin J. Mitchell
68f9135bb3 Bug 1302192: ensure that only one option matches by-*; r=wcosta
If an item matches exactly, it is always selected.  This will catch the case
where multiple regular expressions match (the previous version would silently
pick one based on dictionary order).

I was worried this was occurring, but because exact matches items are selected,
it is not; still, best to be sure.

MozReview-Commit-ID: EtZBTr61SvE

--HG--
extra : rebase_source : 64300b8722709711d9be66f63f808f4e340532d9
2016-12-23 21:20:51 +00:00
Wes Kocher
7145ee5d12 Merge inbound to central, a=merge
MozReview-Commit-ID: 56QI5RIvpXC
2016-12-23 14:34:55 -08:00