From 6ef07e5ea6fe1934b4c0e9c9cae5f387a03ae1fc Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Fri, 15 Nov 2019 14:56:12 +0000
Subject: [PATCH] Bug 1596280 - Make consistently passing linux64-ccov-opt
 suites tier 2. r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D53183

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/test/compiled.yml          | 1 +
 taskcluster/ci/test/mochitest.yml         | 3 +++
 taskcluster/ci/test/web-platform.yml      | 2 ++
 taskcluster/ci/test/xpcshell.yml          | 1 +
 taskcluster/taskgraph/transforms/tests.py | 4 ----
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml
index 024c02434cd3..9702102b68e4 100644
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@@ -65,6 +65,7 @@ gtest:
             windows10-64-pgo.*: 3
             windows10-64-asan.*: 3
             windows10-aarch64.*: 2
+            linux64-ccov/opt: 3
             default: default
 
 jittest:
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index 3dccb40a6c7c..eaf00575ca4b 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -49,6 +49,7 @@ mochitest:
     tier:
         by-test-platform:
             windows10-aarch64.*: 2
+            linux64-ccov/opt: 3
             default: default
     chunks:
         by-test-platform:
@@ -96,6 +97,7 @@ mochitest-browser-chrome:
     tier:
         by-test-platform:
             windows10-aarch64.*: 2
+            linux64-ccov/opt: 3
             default: default
     chunks:
         by-test-platform:
@@ -174,6 +176,7 @@ mochitest-devtools-chrome:
     tier:
         by-test-platform:
             windows10-aarch64.*: 2
+            linux64-ccov/opt: 3
             default: default
     max-run-time:
         by-test-platform:
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index 90b9c1b83d3d..be0ff8c7cd33 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -66,6 +66,7 @@ web-platform-tests:
             linux64-asan/opt: 2
             windows10-aarch64.*: 2
             .*-qr/.*: 2  # can't be tier-1 if it's not running on integration branches
+            linux64-ccov/opt: 3
             default: default
     mozharness:
         chunked: true
@@ -128,6 +129,7 @@ web-platform-tests-wdspec:
             android.*: 3
             linux64-asan/opt: 2
             .*-qr/.*: 2  # can't be tier-1 if it's not running on integration branches
+            linux64-ccov/opt: 3
             default: default
 
 web-platform-tests-wdspec-headless:
diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml
index 76e51c152789..ab22c78cc3c5 100644
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -68,6 +68,7 @@ xpcshell:
         by-test-platform:
             windows10-64-asan.*: 3
             windows10-aarch64.*: 2
+            linux64-ccov/opt: 3
             default: default
     fetches:
         toolchain:
diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
index e6516e5c89c6..b1441cab35bd 100644
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -1078,10 +1078,6 @@ def enable_code_coverage(config, tests):
                 test['run-on-projects'] = []
                 continue
 
-            # For now, make all ccov opt tests tier-3.
-            if 'opt' in test['build-platform']:
-                test['tier'] = 3
-
             # Skip this transform for android code coverage builds.
             if 'android' in test['build-platform']:
                 test.setdefault('fetches', {}).setdefault('toolchain', []).append('linux64-grcov')