icecat: add release icecat-140.8.0-2 for aramo

icecat/taskcluster/config.yml

@@ -191,7 +191,7 @@ treeherder:
         'Boot': 'Bootstrap'
         'Attr-L10n': 'Build Attribution'
         'android-l10n': 'Import strings from android-l10n repo'
-        'update-test': 'Test updates to release from older icecat versions'
+        'updt-tst': 'Test updates to release from older icecat versions'
 
         # The below symbols are from icecat-android (fenix/focus/android-components)
         'buildconfig': 'Make sure the content of .buildconfig.yml matches what gradle knows about its projects'

icecat/taskcluster/docker/debian-raw/Dockerfile

@@ -69,7 +69,16 @@ RUN apt-get update && \
       apt-get install python3-minimal libpython3-stdlib; \
       echo 'dir::bin::methods::http "/usr/local/sbin/snapshot-hack.py";' >> /etc/apt/apt.conf.d/99taskcluster; \
     fi && \
-    apt-get dist-upgrade && \
     apt-get install \
       apt-transport-https \
-      ca-certificates
+      ca-certificates && \
+    if [ -n "$SNAPSHOT" -a -f /etc/apt/sources.list.d/ubuntu.sources ]; then \
+      echo "APT::Snapshot \"$SNAPSHOT\";" > /etc/apt/apt.conf.d/99snapshot && \
+      ( echo 'Package: *'; \
+        echo 'Pin: origin "snapshot.ubuntu.com"'; \
+        echo 'Pin-Priority: 1001'; \
+      ) > /etc/apt/preferences.d/90snapshot && \
+      downgrades=--allow-downgrades && \
+      apt-get update; fi && \
+    apt-get dist-upgrade ${downgrades} && \
+    rm -f /etc/apt/preferences.d/90snapshot

icecat/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh

@@ -13,7 +13,7 @@ Usage: $(basename "$0") [-p product]
            # Use archive.m.o instead of the taskcluster index to get xpcshell
            [--use-ftp-builds]
            # Use git rather than hg. Using git does not currently support cloning (use
-           # --skip-repo as well).
+           # --skip-clone as well).
            [--use-git]
            # One (or more) of the following actions must be specified.
            --hsts | --hpkp | --remote-settings | --suffix-list | --mobile-experiments | --ct-logs
@@ -407,9 +407,18 @@ function compare_remote_settings_files {
 
   # 1. List remote settings collections from server.
   echo "INFO: fetch remote settings list from server"
-  ${WGET} -qO- "${REMOTE_SETTINGS_SERVER}/buckets/monitor/collections/changes/records" |\
-    ${JQ} -r '.data[] | .bucket+"/"+.collection+"/"+(.last_modified|tostring)' |\
-    # 2. For each entry ${bucket, collection, last_modified}
+  changes_lines="$(
+    ${WGET} -O- \
+      "${REMOTE_SETTINGS_SERVER}/buckets/monitor/collections/changes/changeset?_expected=0" |
+        ${JQ} -r '.changes[] | .bucket+"/"+.collection+"/"+(.last_modified|tostring)'
+  )"
+  line_count="$(printf '%s\n' "${changes_lines}" | wc -l | xargs)"
+  if [ "${line_count}" -le 1 ]; then
+    echo "ERROR: no changes pulled from server" >&2
+    exit 15
+  fi
+
+  # 2. For each entry ${bucket, collection, last_modified}
   while IFS="/" read -r bucket collection last_modified; do
 
     # 3. Check to see if the collection exists in the dump directory of the repository,
@@ -467,7 +476,7 @@ function compare_remote_settings_files {
     else
       ${HG} --cwd "${TOPSRCDIR}" purge services/settings/dumps/main/search-config-icons
     fi
-  done
+  done <<< "${changes_lines}"
 
   echo "INFO: diffing old/new remote settings dumps..."
   create_repo_diff "${REMOTE_SETTINGS_DIR}" "${REMOTE_SETTINGS_DIFF_ARTIFACT}"

icecat/taskcluster/docker/recipes/ubuntu2404-test-system-setup-base.sh

@@ -7,14 +7,6 @@ test "$(whoami)" == 'root'
 # We do want to install recommended packages.
 sed -i /APT::Install-Recommends/d /etc/apt/apt.conf.d/99taskcluster
 
-apt-get update && apt-get install ubuntu-dbgsym-keyring
-
-cat > /etc/apt/sources.list.d/ddebs.list <<EOF
-deb http://ddebs.ubuntu.com noble main restricted universe multiverse
-deb http://ddebs.ubuntu.com noble-updates main restricted universe multiverse
-deb http://ddebs.ubuntu.com noble-proposed main restricted universe multiverse
-EOF
-
 # To speed up docker image build times as well as number of network/disk I/O
 # build a list of packages to be installed and call it in one go.
 apt_packages=()
@@ -106,15 +98,16 @@ apt_packages+=('x11-xserver-utils')
 # Build a list of packages to install from the multiverse repo.
 apt_packages+=('ubuntu-restricted-extras')
 
-# libgallium debug symbols
-apt_packages+=('mesa-libgallium-dbgsym')
-
 # APT update takes very long on Ubuntu. Run it at the last possible minute.
 apt-get update
 
 # Also force the cleanup after installation of packages to reduce image size.
 apt-get install --allow-downgrades "${apt_packages[@]}"
 
+# libgallium debug symbols
+wget -O /tmp/mesa-libgallium-dbgsym.ddeb "https://launchpad.net/ubuntu/+archive/primary/+files/mesa-libgallium-dbgsym_24.2.8-1ubuntu1~24.04.1_$ARCH.ddeb"
+dpkg -i /tmp/mesa-libgallium-dbgsym.ddeb
+
 # gsd-power can't start without logind, but it's marked as required in the
 # gnome-session config; remove it so the session doesn't start with the fail
 # whale
@@ -129,13 +122,13 @@ if [[ "$ARCH" == "amd64" ]]; then
     apt_packages=()
     apt_packages+=('libavcodec-extra60:i386')
     apt_packages+=('libpulse0:i386')
-    apt_packages+=('libxt6:i386')
+    apt_packages+=('libxt6t64:i386')
     apt_packages+=('libxtst6:i386')
     apt_packages+=('libsecret-1-0:i386')
-    apt_packages+=('libgtk-3-0:i386')
+    apt_packages+=('libgtk-3-0t64:i386')
     apt_packages+=('libx11-xcb1:i386')
     apt_packages+=('libxcb1:i386')
-    apt_packages+=('libasound2:i386')
+    apt_packages+=('libasound2t64:i386')
 
     apt-get install --allow-downgrades "${apt_packages[@]}"
 fi

icecat/taskcluster/docker/snap-coreXX-build/system-setup.sh

@@ -10,6 +10,9 @@ if [ "${SNAP_BASE}" != "core24" ]; then
     exit 0
 fi;
 
+# Remove snapshot.ubuntu.com configuration for now.
+rm -f /etc/apt/apt.conf.d/99snapshot
+
 # GPG: we need to do it here otherwhise snapcraft tries to do it as user and fails
 CROSS_GPG_KEYID="F6ECB3762474EDA9D21B7022871920D1991BC93C"
 KEYRING_FILENAME="/etc/apt/keyrings/craft-$(echo "${CROSS_GPG_KEYID}" | rev | cut -c 1-8 | rev | tr -d '\n').gpg"

icecat/taskcluster/docs/kinds.rst

@@ -735,6 +735,10 @@ geckodriver-mac-notarization
 ----------------------------
 Apple notarization for mac geckodriver binary.
 
+mark-as-merged
+--------------
+Mark merge automation as completed in shipit.
+
 maybe-release
 -------------
 A shipitscript task that does the following:
@@ -891,9 +895,9 @@ generate-baseline-profile-firebase
 ----------------------------------
 Run baseline profile generation for Android on Firebase TestLab.
 
-update
-------------
-Run tests to see if the executable can be updated to the latest release.
+update-test
+-----------
+Run tests to see if the IceCat executable can be updated to the latest release.
 
 run-macrobenchmark-firebase
 ---------------------------

icecat/taskcluster/gecko_taskgraph/actions/merge_automation.py

@@ -56,6 +56,10 @@ def is_release_promotion_available(parameters):
                 "type": "string",
                 "description": "Path to file used when querying current version.",
             },
+            "merge-automation-id": {
+                "type": "integer",
+                "description": "Shipit merge automation ID for marking as merged.",
+            },
         },
         "required": ["behavior"],
     },
@@ -76,6 +80,7 @@ def merge_automation_action(parameters, graph_config, input, task_group_id, task
         "to-repo",
         "to-branch",
         "fetch-version-from",
+        "merge-automation-id",
     ]:
         if input.get(field):
             parameters["merge_config"][field] = input[field]

icecat/taskcluster/gecko_taskgraph/morph.py

@@ -170,7 +170,7 @@ def make_index_task(
     task.task["payload"]["command"] = ["insert-indexes.js"] + index_paths
     task.task["payload"]["env"] = {
         "TARGET_TASKID": parent_task.task_id,
-        "INDEX_RANK": index_rank,
+        "INDEX_RANK": f"{index_rank}",
     }
     return task
 

icecat/taskcluster/gecko_taskgraph/target_tasks.py

@@ -1221,8 +1221,7 @@ def target_tasks_merge_automation(full_task_graph, parameters, graph_config):
     """Select the set of tasks required to perform repository merges."""
 
     def filter(task):
-        # For now any task in the repo-update kind is ok
-        return task.kind in ["merge-automation"]
+        return task.kind in ["merge-automation", "mark-as-merged"]
 
     return [l for l, t in full_task_graph.tasks.items() if filter(t)]
 

icecat/taskcluster/gecko_taskgraph/test/test_morph.py

@@ -194,7 +194,7 @@ def test_make_index_tasks(make_taskgraph, graph_config):
 
     assert index_task.task["payload"]["command"][0] == "insert-indexes.js"
     assert index_task.task["payload"]["env"]["TARGET_TASKID"] == "a-tid"
-    assert index_task.task["payload"]["env"]["INDEX_RANK"] == 1540722354
+    assert index_task.task["payload"]["env"]["INDEX_RANK"] == "1540722354"
 
     # check the scope summary
     assert index_task.task["scopes"] == ["index:insert-task:gecko.v2.mozilla-central.*"]

icecat/taskcluster/gecko_taskgraph/transforms/docker_image.py

@@ -29,9 +29,9 @@ CONTEXTS_DIR = "docker-contexts"
 DIGEST_RE = re.compile("^[0-9a-f]{64}$")
 
 IMAGE_BUILDER_IMAGE = (
-    "mozillareleases/image_builder:5.0.0"
+    "mozillareleases/image_builder:5.1.0"
     "@sha256:"
-    "e510a9a9b80385f71c112d61b2f2053da625aff2b6d430411ac42e424c58953f"
+    "7fe70dcedefffffa03237ba5d456d42e0d7461de066db3f7a7c280a104869cd5"
 )
 
 transforms = TransformSequence()
@@ -169,9 +169,6 @@ def fill_template(config, tasks):
                 # FIXME: We aren't currently propagating the exit code
             },
         }
-        # Retry for 'funsize-update-generator' if exit status code is -1
-        if image_name in ["funsize-update-generator"]:
-            taskdesc["worker"]["retry-exit-status"] = [-1]
 
         worker = taskdesc["worker"]
 

icecat/taskcluster/gecko_taskgraph/transforms/mark_as_merged.py

@@ -0,0 +1,31 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from taskgraph.transforms.base import TransformSequence
+from taskgraph.util.schema import resolve_keyed_by
+
+from gecko_taskgraph.util.attributes import release_level
+
+transforms = TransformSequence()
+
+
+@transforms.add
+def make_task_description(config, jobs):
+    merge_config = config.params.get("merge_config", {})
+    merge_automation_id = merge_config.get("merge-automation-id")
+
+    if not merge_automation_id:
+        return
+
+    for job in jobs:
+        resolve_keyed_by(
+            job,
+            "scopes",
+            item_name=job["name"],
+            **{"release-level": release_level(config.params)},
+        )
+
+        job["worker"]["merge-automation-id"] = merge_automation_id
+
+        yield job

icecat/taskcluster/gecko_taskgraph/transforms/task.py

@@ -1307,6 +1307,18 @@ def build_ship_it_shipped_payload(config, task, task_def):
     task_def["payload"] = {"release_name": worker["release-name"]}
 
 
+@payload_builder(
+    "shipit-merged",
+    schema={
+        Required("merge-automation-id"): int,
+    },
+)
+def build_ship_it_merged_payload(config, task, task_def):
+    worker = task["worker"]
+
+    task_def["payload"] = {"automation_id": worker["merge-automation-id"]}
+
+
 @payload_builder(
     "shipit-maybe-release",
     schema={

icecat/taskcluster/gecko_taskgraph/transforms/update_test.py

@@ -0,0 +1,231 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+"""
+Transform the update-test suite to parametrize by locale, source version, machine
+"""
+
+from enum import Enum
+from pathlib import Path
+
+from taskgraph.transforms.base import TransformSequence
+from taskgraph.util.copy import deepcopy
+from taskgraph.util.schema import resolve_keyed_by
+from typing_extensions import final
+
+from gecko_taskgraph import GECKO
+from gecko_taskgraph.util.attributes import is_try, task_name
+
+
+@final
+class ReleaseType(Enum):
+    """Release type"""
+
+    release = 0
+    beta = 1
+    esr = 2
+    other = 3
+
+
+transforms = TransformSequence()
+
+APPLICATIONS = ["fx"]
+
+PLATFORM_TO_DOCKER = {
+    "linux2404-64-shippable": "ubuntu2404-test",
+}
+
+SHIPPED_LOCALES_FILE_PATH = Path(GECKO) / "browser/locales/shipped-locales"
+
+TOP_LOCALES = [
+    "en-US",
+    "zh-CN",
+    "de",
+    "fr",
+    "it",
+    "es-ES",
+    "pt-BR",
+    "ru",
+    "pl",
+]
+
+BASE_TYPE_COMMAND = "./mach update-test"
+
+UPDATE_ARTIFACT_NAME = "public/update-test"
+
+DEFAULT_VERSIONS_BACK = 3
+
+ESR_SUPPORT_CUTOFF = 140
+
+
+def infix_treeherder_symbol(symbol, infix):
+    head, tail = symbol.split("(", 1)
+    if infix.startswith("-"):
+        infix = infix[1:]
+    return f"{head}({tail[:-1]}-{infix})"
+
+
+@transforms.add
+def set_task_configuration(config, tasks):
+    release_type = ReleaseType.release
+    if config.params["release_type"] == "beta":
+        release_type = ReleaseType.beta
+    elif config.params["release_type"].startswith("esr"):
+        esr_version = int(config.params["release_type"].split("esr")[1])
+        release_type = ReleaseType.esr
+        if esr_version < ESR_SUPPORT_CUTOFF:
+            yield None
+
+    config_tasks = {}
+    for dep in config.kind_dependencies_tasks.values():
+        if "update-verify-config" in dep.kind:
+            config_tasks[task_name(dep)] = dep
+
+    for task in tasks:
+        for platform in task["test-platforms"]:
+            this_task = deepcopy(task)
+            if config_tasks:
+                if "linux" in platform:
+                    config_task = config_tasks["icecat-linux64"]
+                elif "win" in platform:
+                    config_task = config_tasks["icecat-win64"]
+                elif "osx" in platform:
+                    config_task = config_tasks["icecat-macosx64"]
+                this_task.setdefault("fetches", {})[config_task.label] = [
+                    "update-verify.cfg",
+                ]
+            if "linux" in platform:
+                this_task["worker"]["docker-image"] = {}
+                this_task["worker"]["docker-image"]["in-tree"] = PLATFORM_TO_DOCKER[
+                    platform
+                ]
+
+            this_task.setdefault("attributes", {})
+            this_task["attributes"]["build_platform"] = get_build_platform(platform)
+            name_segments = this_task["name"].split("-")
+            this_task["name"] = "-".join([platform, *name_segments[2:]])
+            this_task["description"] = f"Test updates on {platform}"
+            this_task["treeherder"]["platform"] = f"{platform}/opt"
+            this_task["run"]["cwd"] = "{checkout}"
+            del this_task["test-platforms"]
+
+            if this_task["shipping-product"] == "icecat":
+                product_channel = release_type.name.lower()
+                if this_task["shipping-phase"] == "promote":
+                    update_channel = "-localtest"
+                elif this_task["shipping-phase"] == "push":
+                    update_channel = "-cdntest"
+                else:
+                    raise OSError("Expected promote or push shipping-phase.")
+
+                if this_task["shipping-phase"] != "promote":
+                    this_task["treeherder"]["symbol"] = infix_treeherder_symbol(
+                        this_task["treeherder"]["symbol"],
+                        this_task["shipping-phase"][:6],
+                    )
+                if release_type != ReleaseType.release:
+                    this_task["name"] = this_task["name"] + f"-{product_channel}"
+                this_task["run"]["command"] = (
+                    this_task["run"]["command"]
+                    + f" --channel {product_channel}{update_channel}"
+                )
+
+                if release_type == ReleaseType.esr:
+                    this_task["run"]["command"] = (
+                        this_task["run"]["command"] + f" --esr-version {esr_version}"
+                    )
+
+            if is_try(config.params):
+                this_task["run"]["command"] = (
+                    this_task["run"]["command"] + " --use-balrog-staging"
+                )
+                this_task["worker"]["env"]["BALROG_STAGING"] = "1"
+            this_task["name"] = this_task["name"].replace("linux-docker-", "")
+            this_task["index"]["job-name"] = "update-test-" + this_task["name"]
+
+            resolve_keyed_by(
+                item=this_task,
+                field="worker-type",
+                item_name=this_task["name"],
+                **{"test-platform": platform},
+            )
+
+            for app in APPLICATIONS:
+                if f"-{app}" in this_task["name"]:
+                    break
+
+            if f"{app}-" in this_task["name"]:
+                (_, infix) = this_task["name"].split(app)
+                this_task["treeherder"]["symbol"] = infix_treeherder_symbol(
+                    this_task["treeherder"]["symbol"], infix
+                )
+            yield this_task
+
+
+@transforms.add
+def parametrize_by_locale(config, tasks):
+    with open(SHIPPED_LOCALES_FILE_PATH) as f:
+        shipped_locales = f.read().split()
+    for task in tasks:
+        print(f"===task: {task}===")
+        if "locale" not in task.get("name"):
+            yield task
+            continue
+        for locale in TOP_LOCALES:
+            if locale not in shipped_locales:
+                continue
+            this_task = deepcopy(task)
+            this_task["run"]["command"] = (
+                this_task["run"]["command"] + f" --source-locale {locale}"
+            )
+            this_task["description"] = (
+                f"{this_task['description']}, locale coverage: {locale}"
+            )
+            this_task["name"] = this_task["name"].replace("locale", locale)
+            this_task["index"][
+                "job-name"
+            ] = f"{this_task['index']['job-name']}-{locale}"
+            this_task["treeherder"]["symbol"] = infix_treeherder_symbol(
+                this_task["treeherder"]["symbol"], locale.replace("-", "")
+            )
+            yield this_task
+
+
+@transforms.add
+def parametrize_by_source_version(config, tasks):
+    for task in tasks:
+        if "source-version" not in task.get("name"):
+            yield task
+            continue
+        if "-esr" in task.get("name"):
+            yield task
+            continue
+        # NB: We actually want source_versions_back = 0, because it gives us oldest usable ver
+        for v in range(5):
+            # avoid tasks with different names, same defs
+            if v == DEFAULT_VERSIONS_BACK:
+                continue
+            this_task = deepcopy(task)
+            this_task["run"]["command"] = (
+                this_task["run"]["command"] + f" --source-versions-back {v}"
+            )
+            description_tag = (
+                " from 3 major versions back" if v == 0 else f" from {v} releases back"
+            )
+            this_task["description"] = this_task["description"] + description_tag
+            ago_tag = "-from-oldest" if v == 0 else f"-from-{v}-ago"
+            this_task["name"] = this_task["name"].replace("-source-version", ago_tag)
+            this_task["index"]["job-name"] = this_task["index"]["job-name"] + ago_tag
+            this_task["treeherder"]["symbol"] = infix_treeherder_symbol(
+                this_task["treeherder"]["symbol"], "oldst" if v == 0 else f"bk{v}"
+            )
+            yield this_task
+
+
+def get_build_platform(platform):
+    build_platforms = {
+        "win": "win64-shippable",
+        "mac": "macosx64-shippable",
+        "lin": "linux64-shippable",
+    }
+    return build_platforms[platform[:3]]

icecat/taskcluster/gecko_taskgraph/transforms/update_verify_config.py

@@ -150,4 +150,10 @@ def add_command(config, tasks):
             }
         )
 
+        if task.get("index"):
+            task["index"].setdefault(
+                "job-name",
+                f"update-verify-config-{task['name']}-{task['extra']['channel']}",
+            )
+
         yield task

icecat/taskcluster/kinds/docker-image/kind.yml

@@ -112,12 +112,14 @@ tasks:
         symbol: I(ub24-raw)
         definition: debian-raw
         args:
-            BASE_IMAGE: ubuntu:noble
+            BASE_IMAGE: ubuntu:noble-20250714
+            SNAPSHOT: 20250716T072533Z
     ubuntu2404-arm64-raw:
         symbol: I(ub24-a64-raw)
         definition: debian-raw
         args:
-            BASE_IMAGE: ubuntu:noble
+            BASE_IMAGE: ubuntu:noble-20250714
+            SNAPSHOT: 20250716T072533Z
         arch: arm64
     ubuntu2004-packages:
         symbol: I(ub20-pkg)

icecat/taskcluster/kinds/fetch/toolchains.yml

@@ -416,11 +416,13 @@ rust-1.81.0:
 
 rust-nightly:
     description: Rust nightly source code
+    attributes:
+        cached_task: false
     fetch:
         type: git
         include-dot-git: true
         repo: https://github.com/rust-lang/rust/
-        branch: master
+        branch: main
 
 wasi-sdk-11:
     description: wasi-sdk-11 source code

icecat/taskcluster/kinds/mark-as-merged/kind.yml

@@ -0,0 +1,38 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+loader: taskgraph.loader.transform:loader
+
+transforms:
+    - taskgraph.transforms.from_deps
+    - gecko_taskgraph.transforms.mark_as_merged:transforms
+    - gecko_taskgraph.transforms.task:transforms
+
+kind-dependencies:
+    - merge-automation
+
+task-defaults:
+    run-on-repo-type: [hg]
+    description: mark merge automation as completed in shipit
+    worker-type: shipit
+    from-deps:
+        kinds:
+            - merge-automation
+        unique-kinds: false
+        group-by: single
+    worker:
+        implementation: shipit-merged
+    scopes:
+        by-release-level:
+            production:
+                - project:releng:ship-it:server:production
+                - project:releng:ship-it:action:mark-as-merged
+            staging:
+                - project:releng:ship-it:server:staging
+                - project:releng:ship-it:action:mark-as-merged
+    run-on-projects: []
+
+tasks:
+    mark-as-merged:
+        name: mark-as-merged

icecat/taskcluster/kinds/update-test/kind.yml

@@ -0,0 +1,156 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+loader: taskgraph.loader.transform:loader
+
+kind-dependencies:
+    - toolchain
+    - release-update-verify-config
+    - post-balrog-dummy
+    - post-beetmover-dummy
+    - release-balrog-submit-toplevel
+    - release-beetmover-push-to-release
+
+transforms:
+    - gecko_taskgraph.transforms.release:run_on_releases
+    - gecko_taskgraph.transforms.release_deps:transforms
+    - gecko_taskgraph.transforms.update_test:transforms
+    - gecko_taskgraph.transforms.job:transforms
+    - gecko_taskgraph.transforms.task:transforms
+
+task-defaults:
+    shipping-product: icecat
+    run-on-releases: [release, release-rc, beta, esr140]
+    treeherder:
+        kind: other
+        tier: 2
+        symbol: updt-tst(fx)
+    worker:
+        max-run-time: 10800
+        artifacts:
+            - type: directory
+              path: update-test
+              name: public/update-test
+        env:
+            UPLOAD_DIR: .
+            VERSION_LOG_FILENAME: update-test-version-info.log
+    run-on-projects: []
+    index:
+        product: icecat
+    run:
+        using: run-task
+        command: >-
+            ./mach update-test
+    worker-type:
+        by-test-platform:
+            windows11-64-24h2-shippable: win11-64-24h2
+            windows10-64-2009-shippable-qr: win10-64-2009
+            macosx1500-aarch64-shippable: t-osx-1500-m4
+            macosx1470-64-shippable: t-osx-1400-r8
+            macosx1015-64-shippable-qr: t-osx-1015-r8
+            linux.*: t-linux-docker
+
+tasks:
+    update-test-locale-fx:
+        shipping-phase: promote
+        test-platforms:
+            - windows11-64-24h2-shippable
+            - windows10-64-2009-shippable-qr
+            - macosx1500-aarch64-shippable
+            - macosx1470-64-shippable
+            - macosx1015-64-shippable-qr
+
+    update-test-linux-docker-locale-fx:
+        shipping-phase: promote
+        worker:
+            artifacts:
+                - type: directory
+                  path: /builds/worker/artifacts/update-test
+                  name: public/update-test
+            env:
+                UPLOAD_DIR: /builds/worker/artifacts
+                VERSION_LOG_FILENAME: update-test-version-info.log
+        run:
+            command: >-
+                . $HOME/scripts/xvfb.sh && start_xvfb '1600x1200x24' 0 && ./mach update-test
+        test-platforms:
+            - linux2404-64-shippable
+
+    update-test-source-version-fx:
+        shipping-phase: promote
+        test-platforms:
+            - windows11-64-24h2-shippable
+            - windows10-64-2009-shippable-qr
+            - macosx1500-aarch64-shippable
+            - macosx1470-64-shippable
+            - macosx1015-64-shippable-qr
+
+    update-test-linux-docker-source-version-fx:
+        shipping-phase: promote
+        worker:
+            artifacts:
+                - type: directory
+                  path: /builds/worker/artifacts/update-test
+                  name: public/update-test
+            env:
+                UPLOAD_DIR: /builds/worker/artifacts
+                VERSION_LOG_FILENAME: update-test-version-info.log
+        run:
+            command: >-
+                . $HOME/scripts/xvfb.sh && start_xvfb '1600x1200x24' 0 && ./mach update-test
+        test-platforms:
+            - linux2404-64-shippable
+
+    update-test-fx-bkg:
+        shipping-phase: promote
+        run:
+            command: >-
+                ./mach update-test --test-type Background
+        test-platforms:
+            - windows11-64-24h2-shippable
+            - windows10-64-2009-shippable-qr
+            - macosx1500-aarch64-shippable
+            - macosx1470-64-shippable
+            - macosx1015-64-shippable-qr
+
+    update-test-linux-docker-fx-bkg:
+        shipping-phase: promote
+        worker:
+            artifacts:
+                - type: directory
+                  path: /builds/worker/artifacts/update-test
+                  name: public/update-test
+            env:
+                UPLOAD_DIR: /builds/worker/artifacts
+                VERSION_LOG_FILENAME: update-test-version-info.log
+        run:
+            command: >-
+                . $HOME/scripts/xvfb.sh && start_xvfb '1600x1200x24' 0 && ./mach update-test --test-type Background
+        test-platforms:
+            - linux2404-64-shippable
+
+    update-test-push-locale-fx:
+        run-on-releases: [release, esr140]
+        shipping-phase: push
+        test-platforms:
+            - windows11-64-24h2-shippable
+            - macosx1500-aarch64-shippable
+
+    update-test-linux-docker-push-locale-fx:
+        run-on-releases: [release, esr140]
+        shipping-phase: push
+        worker-type: t-linux-docker
+        worker:
+            artifacts:
+                - type: directory
+                  path: /builds/worker/artifacts/update-test
+                  name: public/update-test
+            env:
+                UPLOAD_DIR: /builds/worker/artifacts
+                VERSION_LOG_FILENAME: update-test-version-info.log
+        run:
+            command: >-
+                . $HOME/scripts/xvfb.sh && start_xvfb '1600x1200x24' 0 && ./mach update-test
+        test-platforms:
+            - linux2404-64-shippable

icecat/taskcluster/kinds/update/kind.yml

@@ -1,68 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
----
-loader: taskgraph.loader.transform:loader
-
-kind-dependencies:
-    - toolchain
-
-transforms:
-    - gecko_taskgraph.transforms.job:transforms
-    - gecko_taskgraph.transforms.task:transforms
-
-task-defaults:
-    treeherder:
-        kind: other
-        tier: 2
-    worker:
-        max-run-time: 10800
-        artifacts: []
-
-tasks:
-    windows2012-64-icecat:
-        worker-type: win11-64-24h2-source
-        description: Test updates on Win64
-        run-on-projects: []
-        treeherder:
-            symbol: update-test(icecat)
-            platform: windows2012-64/opt
-        index:
-            product: icecat
-            job-name: update-test-win64
-        run:
-            using: run-task
-            cwd: "{checkout}"
-            command: >-
-                ./mach update-test
-
-    macosx64-icecat:
-        worker-type: t-osx-1500-m4
-        description: Test updates on macOS
-        run-on-projects: []
-        treeherder:
-            symbol: update-test(icecat)
-            platform: macosx/opt
-        index:
-            product: icecat
-            job-name: update-test-macOS
-        run:
-            using: run-task
-            cwd: "{checkout}"
-            command: >-
-                ./mach update-test
-
-    linux64-icecat:
-        worker-type: t-linux-docker
-        worker:
-            docker-image: {in-tree: ubuntu2404-test}
-        description: Test updates on Linux
-        run-on-projects: []
-        treeherder:
-            symbol: update-test(icecat)
-            platform: linux64/opt
-        run:
-            using: run-task
-            cwd: "{checkout}"
-            command: >-
-                . $HOME/scripts/xvfb.sh && start_xvfb '1600x1200x24' 0 && ./mach update-test

icecat/taskcluster/test/params/update.sh

@@ -133,5 +133,5 @@ for f in $files; do
             ;;
     esac
 
-    curl -f -L ${TASKCLUSTER_ROOT_URL}/api/${service}/v1/task/${task}/artifacts/public%2Fparameters.yml | yq -y "$filter" > "${f}"
+    curl -f -L ${TASKCLUSTER_ROOT_URL}/api/${service}/v1/task/${task}/artifacts/public%2Fparameters.yml | yq -oy "$filter" > "${f}"
 done