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 474463 c1ce95a63c2626ea5bcaa549c989428085a9811b
parent 474462 f87855b9274cb496c33b37f9c5034a4abb42e95a
child 474464 4c60ec880d31d1da229aaa5d7bb60680794151fd
push id36040
push userrgurzau@mozilla.com
push dateMon, 20 May 2019 13:43:21 +0000
treeherdermozilla-central@319a369ccde4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmtabara
bugs1551738
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
@@ -464,16 +464,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),