Merge pull request #302 from mozilla/revert

Revert "FxCI: Skip shippable builds for PRs"

Author: lissyx

taskcluster/gecko_taskgraph/target_tasks.py

@@ -492,17 +492,13 @@ def filter(task):
         ):
             return False
 
+        if task.kind == "enterprise-test":
+            return True
+
         build_platform = task.attributes.get("build_platform")
         build_type = task.attributes.get("build_type")
         shippable = task.attributes.get("shippable", False)
 
-        level = int(parameters["level"])
-        if ("shippable" in task.label or shippable) and level < 3:
-            return False
-
-        if task.kind == "enterprise-test":
-            return True
-
         if not build_platform or not build_type:
             return True
 

taskcluster/gecko_taskgraph/transforms/task.py

@@ -2079,10 +2079,8 @@ def add_enterprise_index_routes(config, tasks):
         if (
             not "enterprise" in task["label"]
             or "upload" in task["label"]
-            or not "shippable" in task["label"]
             or task["label"].endswith("/debug")
             or task["label"].startswith("enterprise-test")
-            or task["label"].startswith("test-")
         ):
             yield task
             continue

taskcluster/gecko_taskgraph/util/verify.py

@@ -381,9 +381,7 @@ def has_one_route_with(what):
 
     if (
         "upload" in task.label
-        or not "shippable" in task.label
         or task.label.startswith("enterprise-test")
-        or task.label.startswith("test-")
         or task.label.startswith("build-signing")
         or task.label.startswith("build-mac-signing")
     ):
@@ -398,7 +396,6 @@ def has_one_route_with(what):
             )
 
 
-
 @verifications.add("full_task_graph")
 def verify_routes_notification_filters(
     task, taskgraph, scratch_pad, graph_config, parameters

taskcluster/kinds/beetmover-geckoview/kind.yml

@@ -20,7 +20,6 @@ only-for-attributes:
 
 not-for-build-platforms:
     - linux64-shippable/opt
-    - linux64-enterprise/opt
     - linux64-enterprise-shippable/opt
     - linux64-aarch64-shippable/opt
     - linux64-aarch64-enterprise-shippable/opt

taskcluster/kinds/build/linux.yml

@@ -52,66 +52,13 @@ linux64/opt:
             - onnxruntime-x86_64-linux-gnu
 
 linux64-enterprise-shippable/opt:
-    description: "Linux64 Enterprise Shippable Opt"
-    use-pgo: true
-    index:
-        product: firefox
-        job-name: linux64-enterprise-shippable-opt
-    attributes:
-        shippable: true
-        enable-build-signing: true
-        enable-full-crashsymbols: true
-    shipping-phase: build
-    shipping-product: firefox
-    treeherder:
-        platform: linux64-enterprise-shippable/opt
-        symbol: Bpgo(Bent)
-        tier: 1
-    worker-type: b-linux-docker-xlarge-amd
-    worker:
-        max-run-time: 7200
-        env:
-            PERFHERDER_EXTRA_OPTIONS: enterprise
-            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
-            # bug 1690154 - enable full symbols on all branches, but only
-            # upload them on the official set. In conjunction with
-            # `enable-full-crashsymbols`.
-            MOZ_ENABLE_FULL_SYMBOLS: "1"
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_firefox.py
-            - builds/releng_base_linux_64_builds.py
-            - taskcluster_nightly.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        tooltool-downloads: public
-    run-on-projects: ["enterprise-firefox"]
-    run-on-repo-type: ["git"]
-    use-sccache: false
-    use-python: "3.11"
-    fetches:
-        toolchain:
-            - linux64-clang
-            - linux64-rust
-            - linux64-rust-size
-            - linux64-cbindgen
-            - linux64-dump_syms
-            - linux64-sccache
-            - linux64-nasm
-            - linux64-node
-            - linux64-pkgconf
-            - sysroot-x86_64-linux-gnu
-            - sysroot-wasm32-wasi
-            - onnxruntime-x86_64-linux-gnu
-
-linux64-enterprise/opt:
     description: "Linux64 Enterprise Opt"
     index:
         product: firefox
         job-name: linux64-enterprise-opt
     attributes:
+        shippable: true
+        enable-build-signing: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: firefox

taskcluster/kinds/enterprise-test/kind.yml

@@ -4,23 +4,20 @@
 ---
 loader: taskgraph.loader.transform:loader
 
-transforms:
-    - taskgraph.transforms.from_deps
-    - gecko_taskgraph.transforms.enterprise_test:transforms
-    - gecko_taskgraph.transforms.job:transforms
-    - gecko_taskgraph.transforms.task:transforms
-
 only-for-build-platforms:
     - linux64-enterprise-shippable/opt
-    - linux64-enterprise/opt
     - linux64-enterprise/debug
     - macosx64-enterprise-shippable/opt
-    - macosx64-enterprise/opt
     - macosx64-enterprise/debug
     - win64-enterprise-shippable/opt
-    - win64-enterprise/opt
     - win64-enterprise/debug
 
+transforms:
+    - taskgraph.transforms.from_deps
+    - gecko_taskgraph.transforms.enterprise_test:transforms
+    - gecko_taskgraph.transforms.job:transforms
+    - gecko_taskgraph.transforms.task:transforms
+
 kind-dependencies:
     - build
     - fetch

taskcluster/kinds/generate-profile/kind.yml

@@ -57,37 +57,6 @@ tasks:
                 - linux64-clang
                 - linux64-minidump-stackwalk
 
-    linux64-enterprise-shippable/opt:
-        description: "Linux64 Enterprise Profile Generation"
-        shipping-phase: build
-        shipping-product: firefox
-        index:
-            product: firefox
-            job-name: linux64-profile-enterprise
-        treeherder:
-            platform: linux64-enterprise-shippable/opt
-        worker-type: b-linux
-        worker:
-            chain-of-trust: true
-            env:
-                NEED_XVFB: "true"
-            max-run-time: 1200
-            docker-image: {in-tree: ubuntu2404-test}
-            artifacts:
-                - type: directory
-                  name: public/build
-                  path: /builds/worker/artifacts/
-        run:
-            using: run-task
-            cwd: '{checkout}'
-            command: >
-                ./taskcluster/scripts/misc/run-profileserver.sh
-        run-on-projects: ["enterprise-firefox"]
-        fetches:
-            toolchain:
-                - linux64-clang
-                - linux64-minidump-stackwalk
-
     android-x86_64-shippable/opt:
         description: "Android x86_64 Profile Generation"
         shipping-phase: build

taskcluster/kinds/instrumented-build/kind.yml

@@ -74,35 +74,6 @@ tasks:
                 - sysroot-x86_64-linux-gnu
                 - sysroot-wasm32-wasi
 
-    linux64-enterprise-shippable/opt:
-        description: "Linux64 Enterprise Instrumented"
-        index:
-            product: firefox
-            job-name: instrumented-linux64-enterprise
-        shipping-product: firefox
-        treeherder:
-            platform: linux64-enterprise-shippable/opt
-        worker-type: b-linux-docker-amd
-        run:
-            config:
-                - builds/releng_base_firefox.py
-                - builds/releng_base_linux_64_builds.py
-            mozconfig-variant: profile-generate
-            tooltool-downloads: public
-        run-on-projects: ["enterprise-firefox"]
-        fetches:
-            toolchain:
-                - linux64-clang
-                - linux64-rust
-                - linux64-rust-size
-                - linux64-cbindgen
-                - linux64-dump_syms
-                - linux64-nasm
-                - linux64-node
-                - linux64-pkgconf
-                - sysroot-x86_64-linux-gnu
-                - sysroot-wasm32-wasi
-
     linux64-aarch64-shippable/opt:
         description: "Linux AArch64 (a.k.a. ARM64) Instrumented"
         index:

taskcluster/test_configs/test-platforms.yml

@@ -61,14 +61,6 @@ linux2404-64/opt:
         - web-platform-tests
         - web-platform-tests-backlog
 
-linux2404-64-enterprise/opt:
-    build-platform: linux64-enterprise/opt
-    test-sets:
-        - desktop-screenshot-capture
-        - linux-tests
-        - web-platform-tests
-        - web-platform-tests-backlog
-
 linux2404-64-shippable/opt:
     build-platform: linux64-shippable/opt
     test-sets: