From 5aafb319d13a649969b7886673b2ce6406345336 Mon Sep 17 00:00:00 2001
From: Tom Prince <mozilla@hocat.ca>
Date: Wed, 4 Mar 2020 08:41:06 -0800
Subject: [PATCH] [fenix] Bug 1619795: Use toolchain-style fetches (and
 `toolchain-artifact` attribute).

The mozilla-central ffmpeg toolchain (used in Bug 1613479/https://github.com/mozilla-mobile/fenix/pull/8780) has an
artifact that does not start with `public/build/` (it starts with just
`public/`). To easily support that, we want to set the `toolchain-artfiact`
attribute for that task.

We switched `index_search` to be a job-type in
[taskgraph](https://hg.mozilla.org/ci/taskgraph/rev/932b4cf48cc785c31b03f0b9f2cba654bc67bc00)
which pass through `attributes` from the task definition (and is also more
future proof for adding fenix-specific toolchain tasks). This updates taskgraph
and the consumers of the current toolchain.
---
 .taskcluster.yml                  |  2 +-
 taskcluster/ci/geckoview/kind.yml | 12 +++++++++---
 taskcluster/ci/raptor/kind.yml    |  4 ++--
 taskcluster/ci/toolchain/kind.yml | 14 +++++++++++---
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index a0bf6fe277..ef49dd0c07 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -8,7 +8,7 @@ tasks:
     - $let:
           taskgraph:
               branch: taskgraph
-              revision: 7a51e874018f13aa236f5dc64ae7bbcaf942fcf3
+              revision: 932b4cf48cc785c31b03f0b9f2cba654bc67bc00
           trustDomain: mobile
       in:
           $let:
diff --git a/taskcluster/ci/geckoview/kind.yml b/taskcluster/ci/geckoview/kind.yml
index 262e8192bd..3ce6b95997 100644
--- a/taskcluster/ci/geckoview/kind.yml
+++ b/taskcluster/ci/geckoview/kind.yml
@@ -1,11 +1,17 @@
 ---
 loader: taskgraph.loader.transform:loader
 transforms:
-    - taskgraph.transforms.index_search:transforms
+    - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
+job-defaults:
+    worker-type: always-optimized
+    run:
+        using: index-search
+
 jobs:
     nightly:
         description: "upstream nightly job"
-        index-search:
-            - gecko.v2.mozilla-central.nightly.latest.mobile.android-x86_64-opt
+        run:
+            index-search:
+                - gecko.v2.mozilla-central.nightly.latest.mobile.android-x86_64-opt
diff --git a/taskcluster/ci/raptor/kind.yml b/taskcluster/ci/raptor/kind.yml
index 0e54e8a0ac..c3671cbe3b 100644
--- a/taskcluster/ci/raptor/kind.yml
+++ b/taskcluster/ci/raptor/kind.yml
@@ -79,8 +79,8 @@ job-defaults:
             - '--activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity'
             - '--download-symbols=ondemand'
     fetches:
-        linux64-minidump-stackwalk:
-            - artifact: minidump_stackwalk.tar.xz
+        toolchain:
+            - linux64-minidump-stackwalk
 
 jobs:
     tp6m-1-cold:
diff --git a/taskcluster/ci/toolchain/kind.yml b/taskcluster/ci/toolchain/kind.yml
index 66cfd61215..7b72583876 100644
--- a/taskcluster/ci/toolchain/kind.yml
+++ b/taskcluster/ci/toolchain/kind.yml
@@ -1,11 +1,19 @@
 ---
 loader: taskgraph.loader.transform:loader
 transforms:
-    - taskgraph.transforms.index_search:transforms
+    - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
+job-defaults:
+    worker-type: always-optimized
+    run:
+        using: index-search
+
 jobs:
     linux64-minidump-stackwalk:
         description: "minidump_stackwalk toolchain"
-        index-search:
-            - gecko.cache.level-3.toolchains.v3.linux64-minidump-stackwalk.latest
+        attributes:
+            toolchain-artifact: public/build/minidump_stackwalk.tar.gz
+        run:
+            index-search:
+                - gecko.cache.level-3.toolchains.v3.linux64-minidump-stackwalk.latest