Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 54 insertions, 2 deletions

diff --git a/taskcluster/test/params/try-config.yml b/taskcluster/test/params/try-config.yml
new file mode 100644
index 0000000000..4eee79df5e
--- /dev/null
+++ b/taskcluster/test/params/try-config.yml
@@ -0,0 +1,51 @@
+---
+base_repository: https://hg.mozilla.org/mozilla-central
+build_date: 1509479809
+build_number: 1
+app_version: 60.0a1
+version: 60.0a1
+next_version: null
+do_not_optimize: []
+enable_always_target: true
+existing_tasks: {}
+filters:
+    - target_tasks_method
+head_ref: 482ccd66d49e0e4a0d260ca872f770df4983ccea
+head_repository: https://hg.mozilla.org/try
+head_rev: 482ccd66d49e0e4a0d260ca872f770df4983ccea
+hg_branch: default
+level: "1"
+message: "Fuzzy query='foobar"
+moz_build_date: "20171031195649"
+optimize_target_tasks: false
+owner: user@example.com
+project: try
+pushdate: 1509479809
+pushlog_id: "232079"
+release_history: {}
+release_eta: ""
+release_enable_partners: false
+release_partners: []
+release_partner_build_number: 1
+release_partner_config: null
+release_enable_emefree: false
+target_tasks_method: try_tasks
+try_mode: try_task_config
+try_task_config:
+    disable-pgo: true
+    env:
+        TRY_SELECTOR: "fuzzy"
+    tasks:
+        - test-linux1804-64-qr/opt-mochitest-plain-*
+        - test-linux1804-64-shippable-qr/opt-mochitest-plain-headless-1
+        - test-linux1804-64-tsan-qr/opt-mochitest-plain-1
+        - missing-task-label-1
+        - missing-task-label-2
+        - missing-task-label-*
+    use-artifact-builds: true
+release_type: "nightly"
+release_product: null
+required_signoffs: []
+signoff_urls: {}
+phabricator_diff:
+tasks_for: hg-push
diff --git a/taskcluster/test/params/try.yml b/taskcluster/test/params/try-syntax.yml
index 7fddf517f3..7781ce927d 100644
--- a/taskcluster/test/params/try.yml
+++ b/taskcluster/test/params/try-syntax.yml
@@ -18,7 +18,7 @@ level: "1"
 message: "try: -b do -p linux64 -u none"
 moz_build_date: "20171031195649"
 optimize_target_tasks: false
-owner: sfink@mozilla.com
+owner: user@example.com
 project: try
 pushdate: 1509479809
 pushlog_id: "232079"
diff --git a/taskcluster/test/test_new_config.py b/taskcluster/test/test_new_config.py
index a233dce97b..2410bc01a4 100644
--- a/taskcluster/test/test_new_config.py
+++ b/taskcluster/test/test_new_config.py
@@ -48,8 +48,9 @@ PARAMS_NEW_CONFIG.update(
                 t.kind == "test"
                 and t.attributes["unittest_suite"] == "mochitest-browser-chrome"
                 and t.attributes["test_platform"] == "linux1804-64-qr/opt"
+                and ("spi-nw" not in t.label and "a11y-checks" not in t.label)
             ),
-            64,
+            32,
             id="mochitest-browser-chrome",
         ),
     ),