[processor] Save the merged report and infer labels from browser_channel

results-processor/main.py

@@ -168,11 +168,19 @@ def task_handler():
         # to tell TaskQueue to drop the task.
         return ('', HTTPStatus.NO_CONTENT)
 
-    resp = "{} results loaded from {}\n".format(len(report.results), gcs_path)
+    resp = "{} results loaded from {}\n".format(
+        len(report.results), str(gcs_paths))
 
     raw_results_gcs_path = '/{}/{}/report.json'.format(
         config.raw_results_bucket(), report.sha_product_path)
-    gsutil.copy('gs:/' + gcs_path, 'gs:/' + raw_results_gcs_path)
+    if result_type == 'single':
+        # If the original report isn't chunked, we store it directly without
+        # the roundtrip to serialize it back.
+        gsutil.copy('gs:/' + gcs_paths[0], 'gs:/' + raw_results_gcs_path)
+    else:
+        with tempfile.NamedTemporaryFile(suffix='.json.gz') as temp:
+            report.serialize_gzip(temp.name)
+            gsutil.copy(temp.name, 'gs:/' + raw_results_gcs_path, gzipped=True)
 
     tempdir = tempfile.mkdtemp()
     try:

results-processor/wptreport.py

@@ -23,6 +23,15 @@
 
 DEFAULT_PROJECT = 'wptdashboard'
 GCS_PUBLIC_DOMAIN = 'https://storage.googleapis.com'
+CHANNEL_TO_LABEL = {
+    'release': 'stable',
+    'stable': 'stable',
+    'beta': 'beta',
+    'dev': 'experimental',
+    'experimental': 'experimental',
+    'nightly': 'experimental',
+    'preview': 'experimental',
+}
 
 _log = logging.getLogger(__name__)
 
@@ -414,15 +423,22 @@ def finalize(self):
         self.sha_product_path
         self.test_run_metadata
 
+    def serialize_gzip(self, filepath):
+        """Serializes and gzips the in-memory report to a file.
+
+        Args:
+            filepath: A file path to write to.
+        """
+        self.write_gzip_json(filepath, self._report)
+
 
 def prepare_labels(report, labels_str, uploader):
     """Prepares the list of labels for a test run.
 
     The following labels will be automatically added:
     * The name of the uploader
     * The name of the browser
-    * "stable" (as in release channels), if neither "stable" or "experimental"
-      is provided by the uploader.
+    * The release channel of the browser (if the uploader doesn't provide one)
 
     Args:
         report: A WPTReport.
@@ -438,9 +454,15 @@ def prepare_labels(report, labels_str, uploader):
     # Empty labels may be generated here, but they will be removed later.
     for label in labels_str.split(','):
         labels.add(label.strip())
-    # Set the default channel to stable.
-    if ('stable' not in labels) and ('experimental' not in labels):
-        labels.add('stable')
+
+    # Add the release channel label.
+    if not any([i in labels for i in set(CHANNEL_TO_LABEL.values())]):
+        if report.run_info.get('browser_channel') in CHANNEL_TO_LABEL:
+            labels.add(CHANNEL_TO_LABEL[report.run_info['browser_channel']])
+        else:
+            # Default to "stable".
+            labels.add('stable')
+
     # Remove any empty labels.
     if '' in labels:
         labels.remove('')

results-processor/wptreport_test.py

@@ -479,3 +479,34 @@ def test_prepare_labels_from_experimental_label(self):
             prepare_labels(r, 'experimental', 'blade-runner'),
             ['blade-runner', 'experimental', 'firefox']
         )
+
+    def test_prepare_labels_from_stable_label(self):
+        r = WPTReport()
+        r.update_metadata(browser_name='firefox')
+        self.assertListEqual(
+            prepare_labels(r, 'stable', 'blade-runner'),
+            ['blade-runner', 'firefox', 'stable']
+        )
+
+    def test_prepare_labels_from_browser_channel(self):
+        r = WPTReport()
+        r._report = {
+            'run_info': {
+                'product': 'firefox',
+                'browser_channel': 'dev',
+            }
+        }
+        self.assertListEqual(
+            prepare_labels(r, '', 'blade-runner'),
+            ['blade-runner', 'experimental', 'firefox']
+        )
+        r._report['run_info']['browser_channel'] = 'nightly'
+        self.assertListEqual(
+            prepare_labels(r, '', 'blade-runner'),
+            ['blade-runner', 'experimental', 'firefox']
+        )
+        r._report['run_info']['browser_channel'] = 'beta'
+        self.assertListEqual(
+            prepare_labels(r, '', 'blade-runner'),
+            ['beta', 'blade-runner', 'firefox']
+        )