Backed out changeset d392d81c5b9e (bug 1297585) for breaking artifact desktop builds

--HG--
extra : rebase_source : 0a2e4754b68f2fd5ed98872c4b2981b18c37aa5a

python/mozbuild/mozbuild/artifacts.py

@@ -638,8 +638,7 @@ class TaskCache(CacheManager):
             # extract the build ID; we use the .ini files embedded in the
             # downloaded artifact for this.  We could also use the uploaded
             # public/build/buildprops.json for this purpose.
-            replDict = {'taskId': taskId, 'name': artifact_name}
-            url = self._queue.buildUrl('getLatestArtifact', replDict=replDict)
+            url = self._queue.buildUrl('getLatestArtifact', taskId, artifact_name)
             urls.append(url)
         if not urls:
             raise ValueError('Task for {key} existed, but no artifacts found!'.format(key=key))

testing/docker/rust-build/tcbuild.py

@@ -101,8 +101,7 @@ def fetch_artifact(queue, task_id, run_id, name, dest_dir):
     write it to a file in dest_dir, and return the path to the written
     file.
     '''
-    replDict = {'taskId': task_id, 'runId': run_id, 'name': name}
-    url = queue.buildUrl('getArtifact', replDict=replDict)
+    url = queue.buildUrl('getArtifact', task_id, run_id, name)
     fn = os.path.join(dest_dir, os.path.basename(name))
     print('Fetching %s...' % name)
     try: