From 419403efee320a465c829a8ed4a112565dbc87f7 Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Fri, 13 Jan 2023 17:46:57 +0100 Subject: [PATCH] Bug 1808605 - part 10: Merge toolchain tasks (cherry picked from commit 6c6cc576b941f5dc606d6afe831d8c6cbf360e8d) --- taskcluster/ci/toolchain/android.yml | 63 ---------------------- taskcluster/ci/toolchain/gecko-derived.yml | 58 -------------------- taskcluster/ci/toolchain/kind.yml | 18 ------- 3 files changed, 139 deletions(-) delete mode 100644 taskcluster/ci/toolchain/android.yml delete mode 100644 taskcluster/ci/toolchain/gecko-derived.yml delete mode 100644 taskcluster/ci/toolchain/kind.yml diff --git a/taskcluster/ci/toolchain/android.yml b/taskcluster/ci/toolchain/android.yml deleted file mode 100644 index 6a0c2cae53..0000000000 --- a/taskcluster/ci/toolchain/android.yml +++ /dev/null @@ -1,63 +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/. ---- -task-defaults: - run: - using: toolchain-script - treeherder: - kind: build - platform: toolchains/opt - tier: 1 - - -linux64-android-sdk-linux-repack: - attributes: - artifact_prefix: mobile/android-sdk - description: "Android SDK (Linux) repack toolchain build" - fetches: - fetch: - - android-sdk - run: - script: repack-android-sdk-linux.sh - resources: [] - toolchain-artifact: mobile/android-sdk/android-sdk-linux.tar.xz - toolchain-alias: android-sdk-linux - treeherder: - symbol: TL(android-sdk-linux) - worker: - docker-image: {in-tree: base} - max-run-time: 1800 - worker-type: b-android - - -linux64-android-gradle-dependencies: - description: "Android Gradle dependencies toolchain task" - fetches: - toolchain: - # Aliases aren't allowed for toolchains depending on toolchains. - - linux64-android-sdk-linux-repack - run: - script: android-gradle-dependencies.sh - sparse-profile: null - resources: - - build.gradle - - taskcluster/scripts/toolchain/android-gradle-dependencies.sh - - taskcluster/scripts/toolchain/android-gradle-dependencies/** - - buildSrc/src/main/java/Dependencies.kt - - buildSrc/src/main/java/AndroidComponents.kt - toolchain-artifact: public/build/android-gradle-dependencies.tar.xz - toolchain-alias: android-gradle-dependencies - treeherder: - symbol: TL(gradle-dependencies) - worker: - docker-image: {in-tree: android-build} - env: - # TODO do no hardcode - ANDROID_SDK_ROOT: /builds/worker/fetches/android-sdk-linux - max-run-time: 14400 - artifacts: - - type: directory - name: public/logs/nexus - path: /opt/sonatype/nexus/logs - worker-type: b-android-xlarge diff --git a/taskcluster/ci/toolchain/gecko-derived.yml b/taskcluster/ci/toolchain/gecko-derived.yml deleted file mode 100644 index 875733e75b..0000000000 --- a/taskcluster/ci/toolchain/gecko-derived.yml +++ /dev/null @@ -1,58 +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/. ---- -task-defaults: - run: - using: index-search - run-on-projects: [] - worker-type: always-optimized - - -browsertime: - attributes: - toolchain-artifact: public/build/browsertime.tar.zst - description: "Browsertime toolchain" - run: - index-search: - - gecko.cache.level-3.toolchains.v3.browsertime.latest - -linux64-ffmpeg-4.1.4: - attributes: - toolchain-artifact: 'public/ffmpeg-4.1.4-i686-static.tar.xz' - description: "FFMPEG fetch" - run: - index-search: - - gecko.cache.level-3.content.v1.linux64-ffmpeg-4.1.4.latest - -linux64-geckodriver: - attributes: - toolchain-artifact: public/build/geckodriver.tar.gz - description: "Geckodriver toolchain" - run: - index-search: - - gecko.v2.mozilla-central.latest.geckodriver.linux64 - -linux64-minidump-stackwalk: - attributes: - toolchain-artifact: public/build/minidump-stackwalk.tar.zst - description: "minidump-stackwalk toolchain" - run: - index-search: - - gecko.cache.level-3.toolchains.v3.linux64-minidump-stackwalk.latest - -linux64-node: - attributes: - toolchain-artifact: public/build/node.tar.zst - description: "Node.js toolchain" - run: - index-search: - - gecko.cache.level-3.toolchains.v3.linux64-node-12.latest - -linux64-node-16: - attributes: - toolchain-artifact: public/build/node.tar.zst - description: "Node.js toolchain" - run: - index-search: - - gecko.cache.level-3.toolchains.v3.linux64-node-16.latest diff --git a/taskcluster/ci/toolchain/kind.yml b/taskcluster/ci/toolchain/kind.yml deleted file mode 100644 index 3ccdef49f1..0000000000 --- a/taskcluster/ci/toolchain/kind.yml +++ /dev/null @@ -1,18 +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: - - fetch - -transforms: - - taskgraph.transforms.job:transforms - - taskgraph.transforms.cached_tasks:transforms - - taskgraph.transforms.task:transforms - - -tasks-from: - - android.yml - - gecko-derived.yml