Bug 1588111 Fix mach try fuzzy --s --full r=catlee
authorSimon Fraser <sfraser@mozilla.com>
Fri, 11 Oct 2019 14:45:08 +0000
changeset 497277 ac3d70b6b575df0460216c306f2b3e2d35634b26
parent 497276 15ff5c7542067cfa94da1ce0c896141be4afea78
child 497278 8b47aa47a640e1ac2bb3250d8d1ecbcce7b24a4b
push id36681
push usercbrindusan@mozilla.com
push dateFri, 11 Oct 2019 21:50:12 +0000
treeherdermozilla-central@c5e6477c3a24 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscatlee
bugs1588111
milestone71.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 1588111 Fix mach try fuzzy --s --full r=catlee Differential Revision: https://phabricator.services.mozilla.com/D48974
tools/tryselect/selectors/fuzzy.py
tools/tryselect/tasks.py
--- a/tools/tryselect/selectors/fuzzy.py
+++ b/tools/tryselect/selectors/fuzzy.py
@@ -323,18 +323,22 @@ def run(update=False, query=None, inters
         print(FZF_NOT_FOUND)
         return 1
 
     check_working_directory(push)
     tg = generate_tasks(parameters, full)
     all_tasks = sorted(tg.tasks.keys())
 
     cache_dir = os.path.join(get_state_dir(srcdir=True), 'cache', 'taskgraph')
-    graph_cache = os.path.join(cache_dir, 'target_task_graph')
-    dep_cache = os.path.join(cache_dir, 'target_task_dependencies')
+    if full:
+        graph_cache = os.path.join(cache_dir, 'full_task_graph')
+        dep_cache = os.path.join(cache_dir, 'full_task_dependencies')
+    else:
+        graph_cache = os.path.join(cache_dir, 'target_task_graph')
+        dep_cache = os.path.join(cache_dir, 'target_task_dependencies')
 
     if show_estimates:
         download_task_history_data()
         make_trimmed_taskgraph_cache(graph_cache, dep_cache)
 
     if not full:
         all_tasks = filter(filter_target_task, all_tasks)
 
--- a/tools/tryselect/tasks.py
+++ b/tools/tryselect/tasks.py
@@ -101,17 +101,20 @@ def generate_tasks(params=None, full=Fal
 
         # write cache
         with open(os.path.join(cache_dir, attr), 'w') as fh:
             json.dump(tg.to_json(), fh)
         return tg
 
     tg_full = generate('full_task_set')
     tg_target = generate('target_task_set')
-    generate('target_task_graph')  # discard results, we only need cache.
+    # discard results from these, we only need cache.
+    if full:
+        generate('full_task_graph')
+    generate('target_task_graph')
 
     os.chdir(cwd)
     if full:
         return tg_full
     return tg_target
 
 
 def filter_tasks_by_paths(tasks, paths):