Bug 1687594 - Don't take path@task-id arguments on mach artifact toolchain. r=firefox-build-system-reviewers,mhentges

This form hasn't been used since bug 1573435.

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

js/src/devtools/automation/winbuildenv.sh

@@ -27,6 +27,6 @@ mk_export_correct_style VC_PATH
 if ! which mozmake 2>/dev/null; then
     export PATH="$PATH:$SOURCE/.."
     if ! which mozmake 2>/dev/null; then
-  ( cd $SOURCE/..; $SOURCE/mach artifact toolchain -v --tooltool-manifest $SOURCE/browser/config/tooltool-manifests/${platform:-win32}/releng.manifest --retry 4${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}})
+  ( cd $SOURCE/..; $SOURCE/mach artifact toolchain -v --tooltool-manifest $SOURCE/browser/config/tooltool-manifests/${platform:-win32}/releng.manifest --retry 4${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}})
     fi
 fi

python/mozbuild/mozbuild/artifact_commands.py

@@ -257,12 +257,6 @@ class PackageFrontend(MachCommandBase):
         metavar="FILE",
         help="Store a manifest about the downloaded taskcluster artifacts",
     )
-    @CommandArgument(
-        "files",
-        nargs="*",
-        help="A list of files to download, in the form path@task-id, in "
-        "addition to the files listed in the tooltool manifest.",
-    )
     def artifact_toolchain(
         self,
         verbose=False,
@@ -274,7 +268,6 @@ class PackageFrontend(MachCommandBase):
         retry=0,
         bootstrap=False,
         artifact_manifest=None,
-        files=(),
     ):
         """Download, cache and install pre-built toolchains."""
         from mozbuild.artifacts import ArtifactCache
@@ -480,21 +473,6 @@ class PackageFrontend(MachCommandBase):
                 record = ArtifactRecord(task_id, artifact_name)
                 records[record.filename] = record
 
-        # Handle the list of files of the form path@task-id on the command
-        # line. Each of those give a path to an artifact to download.
-        for f in files:
-            if "@" not in f:
-                self.log(
-                    logging.ERROR,
-                    "artifact",
-                    {},
-                    "Expected a list of files of the form path@task-id",
-                )
-                return 1
-            name, task_id = f.rsplit("@", 1)
-            record = ArtifactRecord(task_id, name)
-            records[record.filename] = record
-
         for record in six.itervalues(records):
             self.log(
                 logging.INFO,
@@ -594,8 +572,6 @@ class PackageFrontend(MachCommandBase):
 
         if not downloaded:
             self.log(logging.ERROR, "artifact", {}, "Nothing to download")
-            if files:
-                return 1
 
         if artifacts:
             ensureParentDir(artifact_manifest)

taskcluster/scripts/builder/sm-tooltool-config.sh

@@ -45,7 +45,7 @@ esac
 # manifests.
 BROWSER_PLATFORM=$PLATFORM_OS$BITS
 
-(cd $TOOLTOOL_CHECKOUT && ${GECKO_PATH}/mach artifact toolchain${TOOLTOOL_MANIFEST:+ -v --tooltool-manifest $GECKO_PATH/$TOOLTOOL_MANIFEST}${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}})
+(cd $TOOLTOOL_CHECKOUT && ${GECKO_PATH}/mach artifact toolchain${TOOLTOOL_MANIFEST:+ -v --tooltool-manifest $GECKO_PATH/$TOOLTOOL_MANIFEST}${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE})
 
 ) || exit 1 # end of set -e scope
 

taskcluster/scripts/misc/tooltool-download.sh

@@ -11,12 +11,6 @@ fi
 : TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
 export TOOLTOOL_CACHE
 
-if [ -n "$MOZ_TOOLCHAINS" ]; then
-    echo This script should not be used for toolchain downloads anymore
-    echo Use fetches
-    exit 1
-fi
-
 if [ -z "$TOOLTOOL_MANIFEST" ]; then
     echo This script should not be used when there is no tooltool manifest set
     exit 1

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

@@ -732,11 +732,10 @@ items from that key's value."
 
         c = self.config
         dirs = self.query_abs_dirs()
-        toolchains = os.environ.get("MOZ_TOOLCHAINS")
         manifest_src = os.environ.get("TOOLTOOL_MANIFEST")
         if not manifest_src:
             manifest_src = c.get("tooltool_manifest_src")
-        if not manifest_src and not toolchains:
+        if not manifest_src:
             return self.warning(ERROR_MSGS["tooltool_manifest_undetermined"])
         cmd = [
             sys.executable,
@@ -760,8 +759,6 @@ items from that key's value."
         cache = c["env"].get("TOOLTOOL_CACHE")
         if cache:
             cmd.extend(["--cache-dir", cache])
-        if toolchains:
-            cmd.extend(toolchains.split())
         self.info(str(cmd))
         self.run_command(cmd, cwd=dirs["abs_src_dir"], halt_on_failure=True, env=env)
 

testing/mozharness/mozharness/mozilla/tooltool.py

@@ -60,15 +60,6 @@ class TooltoolMixin(object):
         if cache:
             cmd.extend(["--cache-dir" if self.topsrcdir else "-c", cache])
 
-        toolchains = os.environ.get("MOZ_TOOLCHAINS")
-        if toolchains:
-            if not self.topsrcdir:
-                raise Exception(
-                    "MOZ_TOOLCHAINS is not supported for tasks without "
-                    "a source checkout."
-                )
-            cmd.extend(toolchains.split())
-
         timeout = self.config.get("tooltool_timeout", 10 * 60)
 
         self.retry(

testing/mozharness/scripts/desktop_l10n.py

@@ -456,11 +456,10 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin, VCSMixin, BaseScript):
         env = self.query_bootstrap_env()
         config = self.config
         dirs = self.query_abs_dirs()
-        toolchains = os.environ.get("MOZ_TOOLCHAINS")
         manifest_src = os.environ.get("TOOLTOOL_MANIFEST")
         if not manifest_src:
             manifest_src = config.get("tooltool_manifest_src")
-        if not manifest_src and not toolchains:
+        if not manifest_src:
             return
         python = sys.executable
 
@@ -486,8 +485,6 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin, VCSMixin, BaseScript):
         cache = config["bootstrap_env"].get("TOOLTOOL_CACHE")
         if cache:
             cmd.extend(["--cache-dir", cache])
-        if toolchains:
-            cmd.extend(toolchains.split())
         self.info(str(cmd))
         self.run_command(cmd, cwd=dirs["abs_src_dir"], halt_on_failure=True, env=env)
 

testing/mozharness/scripts/repackage.py

@@ -105,11 +105,10 @@ class Repackage(BaseScript):
     def _run_tooltool(self):
         config = self.config
         dirs = self.query_abs_dirs()
-        toolchains = os.environ.get("MOZ_TOOLCHAINS")
         manifest_src = os.environ.get("TOOLTOOL_MANIFEST")
         if not manifest_src:
             manifest_src = config.get("tooltool_manifest_src")
-        if not manifest_src and not toolchains:
+        if not manifest_src:
             return
 
         cmd = [
@@ -134,8 +133,6 @@ class Repackage(BaseScript):
         cache = config.get("tooltool_cache")
         if cache:
             cmd.extend(["--cache-dir", cache])
-        if toolchains:
-            cmd.extend(toolchains.split())
         self.info(str(cmd))
         self.run_command(cmd, cwd=dirs["abs_src_dir"], halt_on_failure=True)