FxCI: Run some test suites for Enterprise builds

Author: Alexandre Lissy

taskcluster/gecko_taskgraph/target_tasks.py

@@ -486,6 +486,11 @@ def target_tasks_enterprise_firefox_with_tests(
     )
 
     def filter(task):
+        # Enabling tests suites triggers many jobs not required, limit execution
+        # to enterprise builds for now
+        if task.kind in ["test", "mochitest"] and "enterprise" not in task.label:
+            return False
+
         # Only keep builds that have been explicitely flagged
         if task.kind == "build" and not "enterprise-firefox" in task.attributes.get(
             "run_on_projects"

taskcluster/gecko_taskgraph/transforms/job/mozharness_test.py

@@ -175,6 +175,12 @@ def mozharness_test_on_docker(config, job, taskdesc):
     else:
         assert "MOZ_ENABLE_WAYLAND" not in env
 
+    if "enterprise" in job["label"]:
+        assert "MOZ_AUTOMATION" in env
+        assert "MOZ_BYPASS_FELT" in env
+    else:
+        assert "MOZ_BYPASS_FELT" not in env
+
     if mozharness.get("mochitest-flavor"):
         env["MOCHITEST_FLAVOR"] = mozharness["mochitest-flavor"]
 

taskcluster/gecko_taskgraph/transforms/test/worker.py

@@ -69,6 +69,11 @@
         "virtual-with-gpu": "win11-64-24h2-gpu",
         "hardware": "win11-64-24h2-hw",
     },
+    "windows11-64-24h2-enterprise": {
+        "virtual": "win11-64-24h2",
+        "virtual-with-gpu": "win11-64-24h2-gpu",
+        "hardware": "win11-64-24h2-hw",
+    },
     "windows11-64-24h2-ccov": {
         "virtual": "win11-64-24h2",
         "virtual-with-gpu": "win11-64-24h2-gpu",
@@ -218,3 +223,16 @@ def set_wayland_env(config, tasks):
         env["WAYLAND_DISPLAY"] = "wayland-0"
         env["NEED_GNOME_KEYRING"] = "true"
         yield task
+
+
+@transforms.add
+def set_enterprise_bypass_env(config, tasks):
+    for task in tasks:
+        if "enterprise" not in task["test-platform"]:
+            yield task
+            continue
+
+        env = task.setdefault("worker", {}).setdefault("env", {})
+        env["MOZ_AUTOMATION"] = "1"
+        env["MOZ_BYPASS_FELT"] = "1"
+        yield task

taskcluster/kinds/mochitest/kind.yml

@@ -21,7 +21,7 @@ transforms:
 # https://wiki.mozilla.org/Sheriffing/Job_Visibility_Policy
 
 task-defaults:
-    run-on-repo-type: [hg]
+    run-on-repo-type: ["hg", "git"]
     attributes:
         retrigger: true
     use-python: default

taskcluster/kinds/test/kind.yml

@@ -37,7 +37,7 @@ tasks-from:
     - xpcshell.yml
 
 task-defaults:
-    run-on-repo-type: [hg]
+    run-on-repo-type: ["hg", "git"]
     attributes:
         retrigger: true
     use-python: default

taskcluster/test_configs/test-platforms.yml

@@ -61,6 +61,11 @@ linux2404-64/opt:
         - web-platform-tests
         - web-platform-tests-backlog
 
+linux2404-64-enterprise/opt:
+    build-platform: linux64-enterprise/opt
+    test-sets:
+        - linux-tests-enterprise
+
 linux2404-64-shippable/opt:
     build-platform: linux64-shippable/opt
     test-sets:
@@ -240,6 +245,15 @@ windows11-64-24h2/opt:
         - browsertime
         - windows-talos-webgl
 
+windows11-64-24h2-enterprise/opt:
+    build-platform: win64-enterprise/opt
+    build-signing-label:
+        by-variant:
+            msi: repackage-signing-msi-win64-enterprise/opt
+            default: build-signing-win64-enterprise/opt
+    test-sets:
+        - windows11-24h2-tests-enterprise
+
 windows11-64-24h2-shippable/opt:
     build-platform: win64-shippable/opt
     build-signing-label:
@@ -300,28 +314,36 @@ windows11-aarch64-24h2/debug:
 ##
 # MacOS X platforms (matching /macosx.*/)
 
-##  TODO: This is trying to fetch build not done on enterprise-firefox
-##  Exception: Task 'test-macosx1500-aarch64-shippable/opt-xpcshell-1-cf' lists a dependency that does not exist: 'repackage-macosx64-shippable/opt'
-## macosx1500-aarch64/debug:
-##    build-platform: macosx64-aarch64/debug
-##    build-signing-label: repackage-macosx64-aarch64/debug
-##    test-sets:
-##        - macosx1500-aarch64-tests
-##        - macosx1500-64-jittests
+macosx1500-aarch64/debug:
+    build-platform: macosx64-aarch64/debug
+    build-signing-label: repackage-macosx64-aarch64/debug
+    test-sets:
+        - macosx1500-aarch64-tests
+        - macosx1500-64-jittests
+
 ##
-## macosx1500-aarch64-shippable/opt:
-##    build-platform: macosx64-shippable/opt
-##    build-signing-label: repackage-macosx64-shippable/opt
-##    test-sets:
-##        - macosx1500-64-jittests
-##        - macosx1500-64-tests
-##        - macosx1500-64-perftests
+# TODO: Generates weird error on PRs for Enterprise
+# Exception: Task 'test-macosx1500-aarch64-shippable/opt-xpcshell-1-cf' lists a dependency that does not exist: 'repackage-macosx64-shippable/opt'
+#
+# macosx1500-aarch64-shippable/opt:
+#    build-platform: macosx64-shippable/opt
+#    build-signing-label: repackage-macosx64-shippable/opt
+#    test-sets:
+#        - macosx1500-64-jittests
+#        - macosx1500-64-tests
+#        - macosx1500-64-perftests
 
 macosx1470-64-nightlyasrelease/opt:
     build-platform: macosx64-nightlyasrelease/opt
     test-sets:
         - browsertime
 
+macosx1500-64-enterprise/opt:
+    build-platform: macosx64-enterprise/opt
+    build-signing-label: repackage-macosx64-enterprise/opt
+    test-sets:
+        - macosx1500-64-tests-enterprise
+
 macosx1470-64-shippable/opt:
     build-platform: macosx64-shippable/opt
     test-sets:

taskcluster/test_configs/test-sets.yml

@@ -193,6 +193,11 @@ linux-tests:
     - test-verify-wpt
     - xpcshell
 
+linux-tests-enterprise:
+    - marionette-integration
+    - mochitest-plain
+    - xpcshell
+
 linux-2404-tsan-tests:
     - cppunittest
     - crashtest
@@ -342,6 +347,11 @@ windows11-24h2-tests:
     - test-verify-wpt
     - xpcshell
 
+windows11-24h2-tests-enterprise:
+    - marionette-integration
+    - mochitest-plain
+    - xpcshell
+
 mingwclang-tests-debug:
     - cppunittest
     - firefox-ui-functional
@@ -428,6 +438,11 @@ macosx1500-64-tests:
     - web-platform-tests-webcodecs
     - web-platform-tests-eme
 
+macosx1500-64-tests-enterprise:
+    - marionette-integration
+    - mochitest-plain
+    - xpcshell
+
 macosx1500-aarch64-tests:
     - cppunittest
     - mochitest-media