23 files changed, 10 insertions, 18 deletions
diff --git a/taskcluster/ci/source-test/android-compare-locales.yml b/taskcluster/kinds/source-test/android-compare-locales.yml
index 6423ad708d..6423ad708d 100644
--- a/taskcluster/ci/source-test/android-compare-locales.yml
+++ b/taskcluster/kinds/source-test/android-compare-locales.yml
diff --git a/taskcluster/ci/source-test/android-detekt.yml b/taskcluster/kinds/source-test/android-detekt.yml
index 84f46ed6b7..c39ebca218 100644
--- a/taskcluster/ci/source-test/android-detekt.yml
+++ b/taskcluster/kinds/source-test/android-detekt.yml
@@ -11,8 +11,6 @@ job-defaults:
     worker:
         docker-image: {in-tree: lint}
         max-run-time: 1200
-        env:
-            JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.6+10"
     attributes:
         code-review: true
     always-target: true
@@ -20,7 +18,6 @@ job-defaults:
         toolchain:
             - android-sdk-linux
             - android-gradle-dependencies
-            - android-gradle-python-envs
             - linux64-jdk-repack
     platform: 'lint/opt'
     treeherder:
diff --git a/taskcluster/ci/source-test/android-lint.yml b/taskcluster/kinds/source-test/android-lint.yml
index c7eb456021..8cbbcc3385 100644
--- a/taskcluster/ci/source-test/android-lint.yml
+++ b/taskcluster/kinds/source-test/android-lint.yml
@@ -10,11 +10,10 @@ job-defaults:
         use-caches: false
     worker:
         max-run-time: 2700
-        env:
-            JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.6+10"
         docker-image: {in-tree: lint}
     always-target: false
     attributes:
+        build_platform: android
         code-review: true
     dependencies:
         build-fat-aar: build-fat-aar-android-geckoview-fat-aar/opt
@@ -22,7 +21,6 @@ job-defaults:
         toolchain:
             - android-sdk-linux
             - android-gradle-dependencies
-            - android-gradle-python-envs
             - linux64-jdk-repack
         build-fat-aar:
             - target.maven.tar.xz
diff --git a/taskcluster/ci/source-test/buildconfig.yml b/taskcluster/kinds/source-test/buildconfig.yml
index 85f0828a54..a7dffefd09 100644
--- a/taskcluster/ci/source-test/buildconfig.yml
+++ b/taskcluster/kinds/source-test/buildconfig.yml
@@ -4,6 +4,7 @@
 ---
 job-defaults:
     description: Make sure the content of .buildconfig.yml matches what gradle knows about its projects
+    always-target: true
     run:
         using: run-task
         cwd: '{checkout}'
@@ -16,7 +17,6 @@ job-defaults:
         docker-image: {in-tree: lint}
         max-run-time: 1800
         env:
-            JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.6+10"
             GRADLE_USER_HOME: "/builds/worker/checkouts/gecko/mobile/android/gradle/dotgradle-online"
             MOZCONFIG: "/builds/worker/checkouts/gecko/mobile/android/config/mozconfigs/android-arm/nightly-android-lints"
             ANDROID_SDK_ROOT: "/builds/worker/fetches/android-sdk-linux"
@@ -28,7 +28,6 @@ job-defaults:
         toolchain:
             - linux64-jdk-repack
             - android-gradle-dependencies
-            - android-gradle-python-envs
             - android-sdk-linux
     use-python: system
 
diff --git a/taskcluster/ci/source-test/clang.yml b/taskcluster/kinds/source-test/clang.yml
index d77066afe7..d77066afe7 100644
--- a/taskcluster/ci/source-test/clang.yml
+++ b/taskcluster/kinds/source-test/clang.yml
diff --git a/taskcluster/ci/source-test/cram.yml b/taskcluster/kinds/source-test/cram.yml
index 6e29e7c6a6..6e29e7c6a6 100644
--- a/taskcluster/ci/source-test/cram.yml
+++ b/taskcluster/kinds/source-test/cram.yml
diff --git a/taskcluster/ci/source-test/doc.yml b/taskcluster/kinds/source-test/doc.yml
index 3e0459f8f0..b876d801ba 100644
--- a/taskcluster/ci/source-test/doc.yml
+++ b/taskcluster/kinds/source-test/doc.yml
@@ -4,13 +4,14 @@
 ---
 generate:
     description: Generate the Sphinx documentation
+    use-python: "3.11"
     platform: doc/opt
     treeherder:
         symbol: doc(generate)
         kind: test
         tier: 1
     run-on-projects: ['trunk']
-    worker-type: t-linux-xlarge-source
+    worker-type: b-linux-medium-gcp
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
@@ -37,6 +38,7 @@ generate:
 
 upload:
     description: Generate and upload the Sphinx documentation
+    use-python: "3.11"
     platform: doc/opt
     attributes:
         code-review: true
@@ -45,7 +47,7 @@ upload:
         kind: test
         tier: 2
     run-on-projects: [mozilla-central-only]
-    worker-type: t-linux-xlarge-source
+    worker-type: b-linux-medium-gcp
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
diff --git a/taskcluster/ci/source-test/file-metadata.yml b/taskcluster/kinds/source-test/file-metadata.yml
index b1fffaf64f..b1fffaf64f 100644
--- a/taskcluster/ci/source-test/file-metadata.yml
+++ b/taskcluster/kinds/source-test/file-metadata.yml
diff --git a/taskcluster/ci/source-test/jsshell.yml b/taskcluster/kinds/source-test/jsshell.yml
index 2ce0a846d4..2ce0a846d4 100644
--- a/taskcluster/ci/source-test/jsshell.yml
+++ b/taskcluster/kinds/source-test/jsshell.yml
diff --git a/taskcluster/ci/source-test/kind.yml b/taskcluster/kinds/source-test/kind.yml
index f28ee39f96..f28ee39f96 100644
--- a/taskcluster/ci/source-test/kind.yml
+++ b/taskcluster/kinds/source-test/kind.yml
diff --git a/taskcluster/ci/source-test/ktlint.yml b/taskcluster/kinds/source-test/ktlint.yml
index 988f2b6660..1828887dc0 100644
--- a/taskcluster/ci/source-test/ktlint.yml
+++ b/taskcluster/kinds/source-test/ktlint.yml
@@ -15,7 +15,6 @@ job-defaults:
         toolchain:
             - android-sdk-linux
             - android-gradle-dependencies
-            - android-gradle-python-envs
             - linux64-jdk-repack
     platform: 'lint/opt'
     treeherder:
@@ -25,8 +24,6 @@ job-defaults:
     worker:
         docker-image: {in-tree: lint}
         max-run-time: 1200
-        env:
-            JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.6+10"
     when:
         files-changed:
             - "mobile/android/android-components/**"
diff --git a/taskcluster/ci/source-test/mozlint-android.yml b/taskcluster/kinds/source-test/mozlint-android.yml
index d98abe9734..6602d8c818 100644
--- a/taskcluster/ci/source-test/mozlint-android.yml
+++ b/taskcluster/kinds/source-test/mozlint-android.yml
@@ -81,7 +81,6 @@ lints:
         toolchain:
             # Aliases aren't allowed for toolchains installed by fetch.
             - linux64-android-gradle-dependencies
-            - android-gradle-python-envs
             - linux64-android-sdk-linux-repack
             - linux64-jdk-repack
             - linux64-node
diff --git a/taskcluster/ci/source-test/mozlint.yml b/taskcluster/kinds/source-test/mozlint.yml
index e101049103..e101049103 100644
--- a/taskcluster/ci/source-test/mozlint.yml
+++ b/taskcluster/kinds/source-test/mozlint.yml
diff --git a/taskcluster/ci/source-test/node.yml b/taskcluster/kinds/source-test/node.yml
index 1d8c8348fb..1d8c8348fb 100644
--- a/taskcluster/ci/source-test/node.yml
+++ b/taskcluster/kinds/source-test/node.yml
diff --git a/taskcluster/ci/source-test/puppeteer.yml b/taskcluster/kinds/source-test/puppeteer.yml
index 3bfd1a9645..3bfd1a9645 100644
--- a/taskcluster/ci/source-test/puppeteer.yml
+++ b/taskcluster/kinds/source-test/puppeteer.yml
diff --git a/taskcluster/ci/source-test/python.yml b/taskcluster/kinds/source-test/python.yml
index 43680aacad..c8214d17d5 100644
--- a/taskcluster/ci/source-test/python.yml
+++ b/taskcluster/kinds/source-test/python.yml
@@ -47,7 +47,7 @@ firefox-ci:
     when:
         files-changed:
             - '.taskcluster.yml'
-            - 'taskcluster/ci/**'
+            - 'taskcluster/kinds/**'
             - 'taskcluster/**/*.py'
             - 'tools/tryselect/selectors/auto.py'
 
@@ -359,8 +359,8 @@ tryselect:
         subsuite: try
     when:
         files-changed:
-            - 'taskcluster/ci/config.yml'
-            - 'taskcluster/ci/test/**'
+            - 'taskcluster/config.yml'
+            - 'taskcluster/kinds/test/**'
             - 'taskcluster/gecko_taskgraph/transforms/**'
             - 'tools/tryselect/**'
 
diff --git a/taskcluster/ci/source-test/shadow-scheduler.yml b/taskcluster/kinds/source-test/shadow-scheduler.yml
index 97d1b1f30b..97d1b1f30b 100644
--- a/taskcluster/ci/source-test/shadow-scheduler.yml
+++ b/taskcluster/kinds/source-test/shadow-scheduler.yml
diff --git a/taskcluster/ci/source-test/taskgraph.yml b/taskcluster/kinds/source-test/taskgraph.yml
index 3065c80482..da3b27d33b 100644
--- a/taskcluster/ci/source-test/taskgraph.yml
+++ b/taskcluster/kinds/source-test/taskgraph.yml
@@ -38,5 +38,5 @@ diff:
             python taskcluster/scripts/misc/summarize-tgdiff.py /builds/worker/artifacts/diffs/ 20
     when:
         files-changed:
-            - 'taskcluster/ci/**'
+            - 'taskcluster/kinds/**'
             - 'taskcluster/**/*.py'
diff --git a/taskcluster/ci/source-test/vendor.yml b/taskcluster/kinds/source-test/vendor.yml
index c6594c6f68..c6594c6f68 100644
--- a/taskcluster/ci/source-test/vendor.yml
+++ b/taskcluster/kinds/source-test/vendor.yml
diff --git a/taskcluster/ci/source-test/webcompat.yml b/taskcluster/kinds/source-test/webcompat.yml
index 66ff7910a6..66ff7910a6 100644
--- a/taskcluster/ci/source-test/webcompat.yml
+++ b/taskcluster/kinds/source-test/webcompat.yml
diff --git a/taskcluster/ci/source-test/webidl.yml b/taskcluster/kinds/source-test/webidl.yml
index eec7a75e38..eec7a75e38 100644
--- a/taskcluster/ci/source-test/webidl.yml
+++ b/taskcluster/kinds/source-test/webidl.yml
diff --git a/taskcluster/ci/source-test/wpt-manifest.yml b/taskcluster/kinds/source-test/wpt-manifest.yml
index 06b29b60f5..06b29b60f5 100644
--- a/taskcluster/ci/source-test/wpt-manifest.yml
+++ b/taskcluster/kinds/source-test/wpt-manifest.yml
diff --git a/taskcluster/ci/source-test/wpt-metadata.yml b/taskcluster/kinds/source-test/wpt-metadata.yml
index b2c54d62b9..b2c54d62b9 100644
--- a/taskcluster/ci/source-test/wpt-metadata.yml
+++ b/taskcluster/kinds/source-test/wpt-metadata.yml