From deaae0a9f36c11bc3599691076d2c00718074769 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 18 Mar 2020 03:34:44 +0000
Subject: [PATCH] Bug 1618781 - Add toolchains tasks for pdbstr. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D67085

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/toolchain/misc.yml             | 30 +++++++++++++++++++
 taskcluster/scripts/misc/exfiltrate-pdbstr.sh |  9 ++++++
 .../taskgraph/transforms/job/toolchain.py     |  8 +++--
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 taskcluster/scripts/misc/exfiltrate-pdbstr.sh

diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml
index c51a4717ddd3..cf3ace2be24f 100644
--- a/taskcluster/ci/toolchain/misc.yml
+++ b/taskcluster/ci/toolchain/misc.yml
@@ -253,3 +253,33 @@ linux64-wine:
     fetches:
         fetch:
             - wine-3.0.3
+
+win32-pdbstr:
+    description: "pdbstr for 32-bits Windows"
+    treeherder:
+        symbol: TW32(pdbstr)
+    worker-type: b-win2012
+    worker:
+        artifacts:
+            - name: project/gecko/pdbstr/pdbstr.tar.bz2
+              path: pdbstr.tar.bz2
+              type: file
+    run:
+        script: exfiltrate-pdbstr.sh
+        arguments: ['x86']
+        toolchain-artifact: project/gecko/pdbstr/pdbstr.tar.bz2
+
+win64-pdbstr:
+    description: "pdbstr for 64-bits Windows"
+    treeherder:
+        symbol: TW64(pdbstr)
+    worker-type: b-win2012
+    worker:
+        artifacts:
+            - name: project/gecko/pdbstr/pdbstr.tar.bz2
+              path: pdbstr.tar.bz2
+              type: file
+    run:
+        script: exfiltrate-pdbstr.sh
+        arguments: ['x64']
+        toolchain-artifact: project/gecko/pdbstr/pdbstr.tar.bz2
diff --git a/taskcluster/scripts/misc/exfiltrate-pdbstr.sh b/taskcluster/scripts/misc/exfiltrate-pdbstr.sh
new file mode 100644
index 000000000000..301de5e3634c
--- /dev/null
+++ b/taskcluster/scripts/misc/exfiltrate-pdbstr.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -x -e -v
+
+# Copy the file that already exists on Windows workers.
+mkdir pdbstr
+cp "c:/Program Files (x86)/Windows Kits/10/Debuggers/$1/srcsrv/pdbstr.exe" pdbstr
+
+tar -jcvf pdbstr.tar.bz2 pdbstr
diff --git a/taskcluster/taskgraph/transforms/job/toolchain.py b/taskcluster/taskgraph/transforms/job/toolchain.py
index 9e12926f1325..3481536d4113 100644
--- a/taskcluster/taskgraph/transforms/job/toolchain.py
+++ b/taskcluster/taskgraph/transforms/job/toolchain.py
@@ -175,10 +175,12 @@ def windows_toolchain(config, job, taskdesc):
 
     worker = taskdesc['worker'] = job['worker']
 
-    worker['artifacts'] = [{
+    # Allow the job to specify where artifacts come from.
+    worker.setdefault('artifacts', [{
         'path': r'public\build',
         'type': 'directory',
-    }]
+    }])
+
     worker['chain-of-trust'] = True
 
     # There were no caches on generic-worker before bug 1519472, and they cause
@@ -186,7 +188,7 @@ def windows_toolchain(config, job, taskdesc):
     # tasks are ready.
     run['use-caches'] = False
 
-    env = worker['env']
+    env = worker.setdefault('env', {})
     env.update({
         'MOZ_BUILD_DATE': config.params['moz_build_date'],
         'MOZ_SCM_LEVEL': config.params['level'],