Bug 1890910 - delete reftest-no-accel and reftest-snapshot definitions and add a snapshot variant. r=ahal,taskgraph-reviewers

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

layout/tools/reftest/reftestcommandline.py

@@ -478,11 +478,6 @@ class DesktopArgumentsParser(ReftestArgumentsParser):
             help="run tests in parallel if possible",
         )
 
-    def _prefs_gpu(self):
-        if mozinfo.os != "win":
-            return ["layers.acceleration.force-enabled=true"]
-        return []
-
     def validate(self, options, reftest):
         super(DesktopArgumentsParser, self).validate(options, reftest)
 

taskcluster/ci/config.yml

@@ -113,6 +113,8 @@ treeherder:
         'Pup': "Puppeteer tests"
         'R': 'Reftests'
         'R-cf': 'Reftests confirm failure'
+        'R-s': 'Reftest snapshot'
+        'R-s-cf': 'Reftest snapshot with confirm failure'
         'R-nofis': 'Reftests without fission enabled'
         'R-nofis-cf': 'Reftests confirm failure without fission enabled'
         'R-nofis-ship': 'Reftests without fission and with SHIP (session history in parent) enabled (Android specific)'

taskcluster/ci/test/reftest.yml

@@ -176,6 +176,7 @@ reftest:
             windows11.*/opt: 3
             default: 8
     variants:
+        - draw-snapshot
         - geckoview-no-fission-ship
         - no-fission
         - webrender-dcomp-disabled
@@ -186,6 +187,10 @@ reftest:
         - webrender-sw
     run-on-projects:
         by-variant:
+            draw-snapshot:
+                by-test-platform:
+                    linux1804.*/debug: built-projects
+                    default: []
             webrender-sw+no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug: built-projects
@@ -231,6 +236,8 @@ reftest:
                 macosx.*64/opt: false
                 windows.*/opt: false
                 default: true
+        extra-options:
+            - --setpref=layers.acceleration.force-enabled=true
     tier:
         by-variant:
             no-fission:
@@ -266,16 +273,3 @@ reftest-qr:
         chunked: true
     tier: 2
     virtualization: virtual
-
-reftest-snapshot:
-    description: "Reftest snapshot"
-    treeherder-symbol: R(Rs)
-    virtualization: virtual
-    run-on-projects:
-        by-test-platform:
-            linux1804-64-qr/debug: ['trunk']
-            default: []
-    tier: default
-    chunks: 8
-    mozharness:
-        chunked: true

taskcluster/ci/test/test-sets.yml

@@ -173,7 +173,6 @@ linux1804-tests:
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
     - reftest
-    - reftest-snapshot
     - telemetry-tests-client
     - test-verify
     - test-verify-gpu
@@ -212,7 +211,6 @@ linux2204-wayland-tests:
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
     - reftest
-    - reftest-snapshot
     - telemetry-tests-client
     - test-verify
     - test-verify-gpu

taskcluster/ci/test/variants.yml

@@ -414,3 +414,22 @@ http2:
         mozharness:
             extra-options:
                 - "--use-http2-server"
+
+draw-snapshot:
+    description: "{description} with draw snapshot"
+    component: "Core::Graphics"
+    suffix: "s"
+    mozinfo: "snapshot"
+    expiration: "never"
+    when:
+        $eval: '(
+                    "linux" in task["test-platform"]
+                    && "debug" in task["test-platform"]
+                )
+                    && "reftest" == task["try-name"]
+                '
+    replace:
+        virtualization: virtual
+        mozharness:
+            extra-options:
+                - "--setpref=reftest.use-draw-snapshot=true"

taskcluster/gecko_taskgraph/transforms/test/variant.py

@@ -78,6 +78,14 @@ def split_variants(config, tasks):
             remaining_variants.append(name)
         return remaining_variants
 
+    def replace_task_items(task_key, variant_key):
+        for item in variant_key:
+            if isinstance(variant_key[item], dict):
+                task_key[item] = replace_task_items(task_key[item], variant_key[item])
+            else:
+                task_key[item] = variant_key[item]
+        return task_key
+
     def apply_variant(variant, task):
         task["description"] = variant["description"].format(**task)
 
@@ -94,7 +102,9 @@ def split_variants(config, tasks):
         task["variant-suffix"] += suffix
 
         # Replace and/or merge the configuration.
-        task.update(variant.get("replace", {}))
+
+        # we only want to update the leaf node, the the entire top level dict
+        task = replace_task_items(task, variant.get("replace", {}))
         return merge(task, variant.get("merge", {}))
 
     expired_variants = find_expired_variants(TEST_VARIANTS)

testing/mozharness/configs/unittests/linux_unittest.py

@@ -202,27 +202,7 @@ config = {
             "tests": ["tests/jsreftest/tests/js/src/tests/jstests.list"],
         },
         "reftest": {
-            "options": [
-                "--suite=reftest",
-                "--setpref=layers.acceleration.force-enabled=true",
-                "--topsrcdir=tests/reftest/tests",
-            ],
-            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        },
-        "reftest-no-accel": {
-            "options": [
-                "--suite=reftest",
-                "--setpref=layers.acceleration.disabled=true",
-                "--topsrcdir=tests/reftest/tests",
-            ],
-            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        },
-        "reftest-snapshot": {
-            "options": [
-                "--suite=reftest",
-                "--setpref=reftest.use-draw-snapshot=true",
-                "--topsrcdir=tests/reftest/tests",
-            ],
+            "options": ["--suite=reftest", "--topsrcdir=tests/reftest/tests"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
         },
     },

testing/mozharness/configs/unittests/win_unittest.py

@@ -188,14 +188,6 @@ config = {
             "options": ["--suite=reftest", "--topsrcdir=tests/reftest/tests"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
         },
-        "reftest-no-accel": {
-            "options": [
-                "--suite=reftest",
-                "--setpref=layers.acceleration.disabled=true",
-                "--topsrcdir=tests/reftest/tests",
-            ],
-            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"],
-        },
     },
     "all_xpcshell_suites": {
         "xpcshell": {

testing/mozharness/mach_commands.py

@@ -116,11 +116,6 @@ class MozharnessRunner(MozbuildObject):
                 "script": "desktop_unittest.py",
                 "config": desktop_unittest_config + ["--reftest-suite", "reftest"],
             },
-            "reftest-no-accel": {
-                "script": "desktop_unittest.py",
-                "config": desktop_unittest_config
-                + ["--reftest-suite", "reftest-no-accel"],
-            },
             "cppunittest": {
                 "script": "desktop_unittest.py",
                 "config": desktop_unittest_config