Bug 1383996 - Make most calls to `mach artifact toolchain` output a manifest. r=gps

And upload it as artifact.

--HG--
extra : rebase_source : b29cf6fa4527608b45050ad91b4e3248654f1657

taskcluster/scripts/misc/tooltool-download.sh

@@ -23,6 +23,10 @@ if [ -n "$RELENGAPI_PORT" ]; then
     TOOLTOOL_DL_FLAGS="${TOOLTOOL_DL_FLAGS=} --tooltool-url=http://relengapi/tooltool/"
 fi
 
+if [ -n "$UPLOAD_DIR" ]; then
+    TOOLTOOL_DL_FLAGS="${TOOLTOOL_DL_FLAGS=} --artifact-manifest $UPLOAD_DIR/toolchains.json"
+fi
+
 : TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}
 export TOOLTOOL_CACHE
 

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -1131,6 +1131,8 @@ or run without that action (ie: --no-{action})"
             '--retry', '4',
             '--tooltool-manifest',
             tooltool_manifest_path,
+            '--artifact-manifest',
+            os.path.join(dirs['abs_src_dir'], 'toolchains.json'),
             '--tooltool-url',
             c['tooltool_url'],
         ]

testing/mozharness/mozharness/mozilla/tooltool.py

@@ -86,6 +86,8 @@ class TooltoolMixin(object):
 
         if self.topsrcdir:
             cmd.extend(['--tooltool-manifest', manifest])
+            cmd.extend(['--artifact-manifest',
+                        os.path.join(self.topsrcdir, 'toolchains.json')])
         else:
             cmd.extend(['fetch', '-m', manifest, '-o'])
 

testing/mozharness/scripts/desktop_l10n.py

@@ -1077,6 +1077,8 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
             '--retry', '4',
             '--tooltool-manifest',
             tooltool_manifest_path,
+            '--artifact-manifest',
+            os.path.join(dirs['abs_mozilla_dir'], 'toolchains.json'),
             '--tooltool-url',
             config['tooltool_url'],
         ]

testing/mozharness/scripts/repackage.py

@@ -106,6 +106,8 @@ class Repackage(BaseScript):
             '--retry', '4',
             '--tooltool-manifest',
             tooltool_manifest_path,
+            '--artifact-manifest',
+            os.path.join(dirs['abs_mozilla_dir'], 'toolchains.json'),
             '--tooltool-url',
             config['tooltool_url'],
         ]

toolkit/mozapps/installer/upload-files.mk

@@ -408,6 +408,7 @@ UPLOAD_FILES= \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip) \
   $(call QUOTED_WILDCARD,$(topobjdir)/browser/installer/windows/instgen/setup.exe) \
   $(call QUOTED_WILDCARD,$(topobjdir)/browser/installer/windows/instgen/setup-stub.exe) \
+  $(call QUOTED_WILDCARD,$(topsrcdir)/toolchains.json) \
   $(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
 
 ifneq ($(filter-out en-US x-test,$(AB_CD)),)