Bug 1551738: [declarative-artifacts] Filter out artifacts that aren't generated; r=mtabara
authorTom Prince <mozilla@hocat.ca>
Fri, 17 May 2019 12:24:46 +0000
changeset 537012 7d9a79e529ad9c01cef909ecf84a017890c4836c
parent 537011 9710df79dc09caef51323ebac30d437893eed9b7
child 537013 a428cfd1149b6203e9c433ab617880cd8b24ed1d
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmtabara
bugs1551738
milestone68.0
Bug 1551738: [declarative-artifacts] Filter out artifacts that aren't generated; r=mtabara Stub installers aren't generated on esr branches; the repackage task includes metadata indicating this. Use this information to filter out upstream artifacts when use declarative artifacts. Differential Revision: https://phabricator.services.mozilla.com/D31586
taskcluster/taskgraph/util/scriptworker.py
--- a/taskcluster/taskgraph/util/scriptworker.py
+++ b/taskcluster/taskgraph/util/scriptworker.py
@@ -557,16 +557,21 @@ def generate_beetmover_upstream_artifact
             resolve_keyed_by(file_config, "source_path_modifier",
                              'source path modifier', locale=locale)
             paths.append(os.path.join(
                 base_artifact_prefix,
                 jsone.render(file_config['source_path_modifier'], {'locale': locale}),
                 filename,
             ))
 
+        if getattr(job['dependencies'][dep], 'release_artifacts', None):
+            paths = [
+                path for path in paths
+                if path in job['dependencies'][dep].release_artifacts]
+
         if not paths:
             continue
 
         upstream_artifacts.append({
             "taskId": {
                 "task-reference": "<{}>".format(dep)
             },
             "taskType": map_config['tasktype_map'].get(dep),