From eae97034e3283dd80da559d395d98240a38ce678 Mon Sep 17 00:00:00 2001
From: Colin Lee <mncolinlee@gmail.com>
Date: Tue, 27 Aug 2019 15:52:07 -0500
Subject: [PATCH] For  #4897: Add back accidentally removed code coverage
 upload (#4958)

* For  #4897: Add back accidentally removed code coverage upload

* Make code coverage commands clearer

* Inline run_coverage as True

* Update arch label for codecov upload

* Remove variants from codecov, as they aren't used

* Remove unused format string
---
 automation/taskcluster/lib/tasks.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py
index 164dc98ec..a4ebc0b35 100644
--- a/automation/taskcluster/lib/tasks.py
+++ b/automation/taskcluster/lib/tasks.py
@@ -142,11 +142,14 @@ class TaskBuilder(object):
         )
 
     def craft_test_pr_task(self, variant):
-        command = 'test{}UnitTest'.format(variant.name)
+        # upload coverage only once, if the variant is arm64
+        test_gradle_command = \
+            '-Pcoverage jacocoGeckoNightlyDebugTestReport && automation/taskcluster/upload_coverage_report.sh'
+
         return self._craft_clean_gradle_task(
             name='test: {}'.format(variant.name),
             description='Building and testing variant {}'.format(variant.name),
-            gradle_task=command,
+            gradle_task=test_gradle_command,
             treeherder={
                 'groupSymbol': variant.build_type,
                 'jobKind': 'test',