Backed out changeset 7912895e63c5 (bug 1833653) for causing python failures on test/test_mozilla_central.py. CLOSED TREE

taskcluster/ci/config.yml

@@ -605,11 +605,6 @@ workers:
             implementation: generic-worker
             os: linux
             worker-type: 'gecko-{alias}'
-        t-linux-wayland:
-            provisioner: '{trust-domain}-t'
-            implementation: generic-worker
-            os: linux
-            worker-type: 't-linux-vm-2204-wayland'
         t-osx-1015-r8:
             provisioner: releng-hardware
             implementation: generic-worker

taskcluster/ci/test/mochitest.yml

@@ -64,21 +64,18 @@ mochitest-plain:
         - headless+socketprocess_networking
         - http3
         - editor-legacy-direction
-    worker-type:
-        by-test-platform:
-            linux2204-64-wayland.*: t-linux-wayland
-            default: default
     run-on-projects:
         by-variant:
             conditioned_profile:
                 by-test-platform:
-                    .*(asan|ccov|wayland).*: []
+                    .*asan.*: []
+                    .*ccov.*: []
                     linux1804-64(-shippable)?-qr/opt: ['trunk']
                     windows11-64.*(-shippable)?-qr/opt: ['trunk']
                     default: []
             xorigin:
                 by-test-platform:
-                    .*(asan|wayland).*: []
+                    .*asan.*: []
                     windows.*ccov.*: []
                     (linux.*64|macosx.*64|windows11.*)(-shippable)?-qr/(opt|debug): ['trunk']
                     windows.*64-ccov-qr/opt: ['mozilla-central']
@@ -86,7 +83,8 @@ mochitest-plain:
                     default: []
             socketprocess_networking:
                 by-test-platform:
-                    .*(asan|ccov|wayland).*: []
+                    .*asan.*: []
+                    .*ccov.*: []
                     (linux.*64|macosx.*64|windows11-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
                     default: []
             webrender-sw+no-fission:
@@ -105,12 +103,10 @@ mochitest-plain:
                     default: []
             headless:
                 by-test-platform:
-                    .*wayland.*: []
                     linux1804-64.*: ['mozilla-central']
                     default: []
             headless+socketprocess_networking:
                 by-test-platform:
-                    .*wayland.*: []
                     linux1804-64.*: ['mozilla-central']
                     default: []
             no-fission:
@@ -132,7 +128,6 @@ mochitest-plain:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
                     android.*: built-projects
-                    .*wayland.*: []
                     default: built-projects
     chunks:
         by-test-platform:

taskcluster/ci/test/test-platforms.yml

@@ -111,16 +111,6 @@ linux1804-64-clang-trunk-qr/opt:
         - awsy
         - browsertime-clang
 
-linux2204-64-wayland/opt:
-    build-platform: linux64/opt
-    test-sets:
-        - linux2204-wayland-tests
-
-linux2204-64-wayland-shippable/opt:
-    build-platform: linux64-shippable/opt
-    test-sets:
-        - linux2204-wayland-tests
-
 ##
 # Windows platforms (matching /windows.*/)
 

taskcluster/ci/test/test-sets.yml

@@ -177,9 +177,6 @@ linux1804-ccov-tests:
     # on ccov builds.
     - jittest
 
-linux2204-wayland-tests:
-    - mochitest-plain
-
 # Windows
 
 windows-7-tests:

taskcluster/gecko_taskgraph/transforms/test/__init__.py

@@ -519,10 +519,6 @@ def make_job_description(config, tasks):
             run["workdir"] = task.pop("workdir")
 
         jobdesc["worker-type"] = task.pop("worker-type")
-
-        if "worker" in task:
-            jobdesc["worker"] = task.pop("worker")
-
         if task.get("fetches"):
             jobdesc["fetches"] = task.pop("fetches")
 

taskcluster/gecko_taskgraph/transforms/test/worker.py

@@ -122,7 +122,7 @@ def set_worker_type(config, tasks):
         # during the taskcluster migration, this is a bit tortured, but it
         # will get simpler eventually!
         test_platform = task["test-platform"]
-        if task.get("worker-type", "default") != "default":
+        if task.get("worker-type") and task.get("worker-type") != "default":
             # This test already has its worker type defined, so just use that (yields below)
             # Unless the value is set to "default", in that case ignore it.
             pass
@@ -184,16 +184,3 @@ def set_worker_type(config, tasks):
             raise Exception(f"unknown test_platform {test_platform}")
 
         yield task
-
-
-@transforms.add
-def set_wayland_env(config, tasks):
-    for task in tasks:
-        if task["worker-type"] != "t-linux-wayland":
-            yield task
-            continue
-
-        env = task.setdefault("worker", {}).setdefault("env", {})
-        env["MOZ_ENABLE_WAYLAND"] = "1"
-        env["WAYLAND_DISPLAY"] = "wayland-0"
-        yield task