diff options
Diffstat (limited to 'infra/bots/recipes')
70 files changed, 282 insertions, 522 deletions
diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json index a318c9643b..a3b167b1e2 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json @@ -164,7 +164,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" ], diff --git a/infra/bots/recipes/compile.expected/flutter_trybot.json b/infra/bots/recipes/compile.expected/flutter_trybot.json index 4cec7e6ef9..c6d1556ea8 100644 --- a/infra/bots/recipes/compile.expected/flutter_trybot.json +++ b/infra/bots/recipes/compile.expected/flutter_trybot.json @@ -168,7 +168,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" ], diff --git a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index 744e7c77a6..e02579acd9 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -394,7 +394,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -423,7 +423,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -437,7 +437,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave1" ], @@ -528,7 +528,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave2" ], @@ -619,7 +619,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave3" ], @@ -710,7 +710,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave4" ], @@ -801,7 +801,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave5" ], @@ -903,7 +903,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1275,17 +1275,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1425,17 +1421,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1575,17 +1567,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1725,17 +1713,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1875,17 +1859,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json index 4f76beded3..6fd8305db0 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json @@ -394,7 +394,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -423,7 +423,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -437,7 +437,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave1" ], @@ -528,7 +528,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave2" ], @@ -619,7 +619,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave3" ], @@ -710,7 +710,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave4" ], @@ -801,7 +801,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave5" ], @@ -903,7 +903,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1275,17 +1275,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1356,17 +1352,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1437,17 +1429,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1518,17 +1506,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1599,17 +1583,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json index 36a82c279e..083745d09c 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json @@ -394,7 +394,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -423,7 +423,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -437,7 +437,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1" ], @@ -528,7 +528,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2" ], @@ -619,7 +619,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3" ], @@ -710,7 +710,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4" ], @@ -801,7 +801,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5" ], @@ -903,7 +903,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1275,17 +1275,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1356,17 +1352,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1437,17 +1429,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1518,17 +1506,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1599,17 +1583,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 9c0a020a8f..0e893d2a7a 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -398,7 +398,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -427,7 +427,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -441,7 +441,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1" ], @@ -532,7 +532,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2" ], @@ -623,7 +623,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3" ], @@ -714,7 +714,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4" ], @@ -805,7 +805,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5" ], @@ -907,7 +907,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1299,17 +1299,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1380,17 +1376,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1461,17 +1453,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1542,17 +1530,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1623,17 +1607,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json index 4cadd20dfb..7ad7faacb7 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json @@ -394,7 +394,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -423,7 +423,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -437,7 +437,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], @@ -528,7 +528,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], @@ -619,7 +619,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], @@ -710,7 +710,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], @@ -801,7 +801,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], @@ -903,7 +903,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1275,17 +1275,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1356,17 +1352,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1437,17 +1429,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1518,17 +1506,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1599,17 +1583,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index a51eb49921..0f1a7f5fd8 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -394,7 +394,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -423,7 +423,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -437,7 +437,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], @@ -528,7 +528,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], @@ -619,7 +619,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], @@ -710,7 +710,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], @@ -801,7 +801,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], @@ -903,7 +903,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1275,17 +1275,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1360,17 +1356,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1441,17 +1433,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1526,17 +1514,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1607,17 +1591,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index db51003f30..ee33430822 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -394,7 +394,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -423,7 +423,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -437,7 +437,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], @@ -528,7 +528,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], @@ -619,7 +619,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], @@ -710,7 +710,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], @@ -801,7 +801,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], @@ -903,7 +903,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1275,17 +1275,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1356,17 +1352,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1437,17 +1429,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1522,17 +1510,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1603,17 +1587,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index 0bba222009..d74bb38805 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -394,7 +394,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -423,7 +423,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -437,7 +437,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave1" ], @@ -528,7 +528,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave2" ], @@ -619,7 +619,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave3" ], @@ -710,7 +710,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave4" ], @@ -801,7 +801,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave5" ], @@ -903,7 +903,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1290,17 +1290,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1440,17 +1436,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1590,17 +1582,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1740,17 +1728,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1890,17 +1874,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 16f2e8550b..6f03a47caf 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -394,7 +394,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -423,7 +423,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -437,7 +437,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave1" ], @@ -528,7 +528,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave2" ], @@ -619,7 +619,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave3" ], @@ -710,7 +710,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave4" ], @@ -801,7 +801,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave5" ], @@ -903,7 +903,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1290,17 +1290,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1440,17 +1436,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1590,17 +1582,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1740,17 +1728,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1890,17 +1874,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index 4cbbd25fa2..22f0f39770 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -394,7 +394,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -423,7 +423,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -437,7 +437,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave1" ], @@ -528,7 +528,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave2" ], @@ -619,7 +619,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave3" ], @@ -710,7 +710,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave4" ], @@ -801,7 +801,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave5" ], @@ -903,7 +903,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1275,17 +1275,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1356,17 +1352,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1437,17 +1429,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1518,17 +1506,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1599,17 +1583,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index 3815dd3465..98f23bf6fb 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -394,7 +394,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -423,7 +423,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -437,7 +437,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1" ], @@ -528,7 +528,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2" ], @@ -619,7 +619,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3" ], @@ -710,7 +710,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4" ], @@ -801,7 +801,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5" ], @@ -903,7 +903,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1275,17 +1275,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1356,17 +1352,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1437,17 +1429,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1518,17 +1506,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1599,17 +1583,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index a7c3f10d76..7e5ed894f1 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -398,7 +398,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/luci-go" ], @@ -427,7 +427,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/swarming_temp_dir" ], @@ -441,7 +441,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1" ], @@ -532,7 +532,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2" ], @@ -623,7 +623,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3" ], @@ -714,7 +714,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4" ], @@ -805,7 +805,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5" ], @@ -907,7 +907,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "RECIPE_MODULE[skia::isolate]/resources/isolate.py", "[START_DIR]/swarming.client", "batcharchive", "--dump-json", @@ -1309,17 +1309,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1390,17 +1386,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1471,17 +1463,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1552,17 +1540,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", @@ -1633,17 +1617,13 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", - "--show-path", - "--", - "python", - "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "RECIPE_MODULE[skia::swarming]/resources/collect_task.py", "-o", "/path/to/tmp/json", "--task-output-dir", "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5", "--merge-script", - "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "RECIPE_MODULE[skia::swarming]/resources/noop_merge.py", "--merge-additional-args", "[]", "--", diff --git a/infra/bots/recipes/ct_skps.py b/infra/bots/recipes/ct_skps.py index 0abdd8f7fd..86982330db 100644 --- a/infra/bots/recipes/ct_skps.py +++ b/infra/bots/recipes/ct_skps.py @@ -7,8 +7,8 @@ import math DEPS = [ - 'build/file', 'depot_tools/gsutil', + 'file', 'recipe_engine/context', 'recipe_engine/json', 'recipe_engine/path', @@ -19,7 +19,7 @@ DEPS = [ 'ct', 'flavor', 'run', - 'swarming', + 'skia_swarming', 'vars', ] @@ -83,7 +83,7 @@ def RunSteps(api): api.run.copy_build_products( api.flavor.out_dir, isolate_dir) - api.swarming.setup( + api.skia_swarming.setup( infrabots_dir.join('tools', 'luci-go'), swarming_rev='') @@ -103,7 +103,7 @@ def RunSteps(api): download_skps_link) # Delete swarming_temp_dir to ensure it starts from a clean slate. - api.run.rmtree(api.swarming.swarming_temp_dir) + api.run.rmtree(api.skia_swarming.swarming_temp_dir) num_per_slave = api.properties.get( 'num_per_slave', @@ -166,7 +166,7 @@ def RunSteps(api): 'CONFIGURATION': api.vars.configuration, 'BUILDER': buildername, } - api.swarming.create_isolated_gen_json( + api.skia_swarming.create_isolated_gen_json( isolate_path, isolate_dir, 'linux', 'ct-%s-%s' % (skia_tool, slave_num), extra_variables, blacklist=blacklist_skps) @@ -186,7 +186,7 @@ def RunSteps(api): tasks_to_swarm_hashes = [] for slave_start_num in xrange(1, ct_num_slaves+1, max_slaves_to_batcharchive): m = min(max_slaves_to_batcharchive, ct_num_slaves) - batcharchive_output = api.swarming.batcharchive( + batcharchive_output = api.skia_swarming.batcharchive( targets=['ct-' + skia_tool + '-%s' % num for num in range( slave_start_num, slave_start_num + m)]) tasks_to_swarm_hashes.extend(batcharchive_output) @@ -197,7 +197,7 @@ def RunSteps(api): dimensions={'os': 'Ubuntu-14.04', 'cpu': 'x86-64', 'pool': 'Chrome'} if 'GPU' in buildername: dimensions['gpu'] = '10de:104a' - tasks = api.swarming.trigger_swarming_tasks( + tasks = api.skia_swarming.trigger_swarming_tasks( tasks_to_swarm_hashes, dimensions=dimensions, io_timeout=40*60) # Now collect all tasks. @@ -205,10 +205,10 @@ def RunSteps(api): failed_tasks = [] for task in tasks: try: - api.swarming.collect_swarming_task(task) + api.skia_swarming.collect_swarming_task(task) if skia_tool == 'nanobench': - output_dir = api.swarming.tasks_output_dir.join( + output_dir = api.skia_swarming.tasks_output_dir.join( task.title).join('0') utc = api.time.utcnow() gs_dest_dir = 'ct/%s/%d/%02d/%02d/%02d/' % ( diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json index bbb4f59d1e..cab4a88f85 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release/data" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json index ece01be4de..7048b33b4b 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release/data" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json index ee5118b671..69bb9ce39c 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release/data" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json index 71168c09b3..a866cc57b9 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE\\data" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE.json index 1819167514..2221c2c526 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE\\data" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan.json index f7cfd0e94c..f60c0e424a 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan\\data" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json index 9a18e4b63c..a85f320356 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE\\data" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release.json index d52213b21c..68372a3883 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release\\data" ], diff --git a/infra/bots/recipes/perf.expected/trybot.json b/infra/bots/recipes/perf.expected/trybot.json index daa2d7dcd6..352da826d2 100644 --- a/infra/bots/recipes/perf.expected/trybot.json +++ b/infra/bots/recipes/perf.expected/trybot.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release/data" ], diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index a85f75aa4e..318ba2ec68 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -10,9 +10,9 @@ import calendar DEPS = [ - 'build/file', 'core', 'env', + 'file', 'flavor', 'recipe_engine/json', 'recipe_engine/path', diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index 819fbb4b6d..340f802ab7 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -255,7 +255,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/skp_output" ], diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json index b731496138..f5246a03a1 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -255,7 +255,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/skp_output" ], diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index 664077e90e..f6328542ea 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -255,7 +255,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[START_DIR]/skp_output" ], diff --git a/infra/bots/recipes/recreate_skps.py b/infra/bots/recipes/recreate_skps.py index 0da6fe2709..8ca604c44d 100644 --- a/infra/bots/recipes/recreate_skps.py +++ b/infra/bots/recipes/recreate_skps.py @@ -7,8 +7,8 @@ DEPS = [ - 'build/file', 'depot_tools/gclient', + 'file', 'recipe_engine/context', 'recipe_engine/path', 'recipe_engine/properties', diff --git a/infra/bots/recipes/skpbench.py b/infra/bots/recipes/skpbench.py index 08b60d9b23..1d416f7897 100644 --- a/infra/bots/recipes/skpbench.py +++ b/infra/bots/recipes/skpbench.py @@ -10,8 +10,8 @@ import calendar DEPS = [ - 'build/file', 'core', + 'file', 'recipe_engine/context', 'recipe_engine/path', 'recipe_engine/properties', diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android.json index 62e34e745a..c6fe8f7f62 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android.json index 7604b5de9b..9a3ce7d4a6 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json index 07dd273620..fbbaf0b996 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json index 484e9a81bf..a13d632c2b 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android.json index 8cc5cc6477..ef02107e12 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android.json index 8640ee0065..5728d9496c 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json index fa779b7685..2f5a159f77 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan.json index 22febe0cc1..1425278e88 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android.json index 87d7d614c9..c779d41c4f 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json index f459f27eb8..d85d7dd5b5 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json index 19ad113816..b198dbe189 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json index abdd739e4c..45c304a414 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json index 460bc89e87..cd2bcecc4f 100644 --- a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json +++ b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json @@ -572,7 +572,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index 8b585dc4f7..9ae4b9f7be 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index 3066a8a377..ad6ce5cdd6 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json index e47e0af364..ba9ffccdc1 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index 7f567069bc..4d46a13b52 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index c8a5941dda..05fb89bfe7 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index 566da63f28..45fc09d226 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json index 796207bdfa..e38cc6a566 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json index db2006b362..20d3612714 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json index 1db3d85ff4..276ab89db8 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json index 7e5a3f0c52..1855a39fe0 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json index 317e2fc99b..82c124742c 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json index fddeed76c2..c1a3a32888 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json index a9c8984913..f662a99886 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json index e455cf87ef..37f73cd3fb 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json index 04ca84c21a..62152a1c09 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json index a5b70c566e..d9c4e3c5de 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json index 3a147913ee..ff8b9075fa 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json b/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json index 5d6c05d583..de3127c560 100644 --- a/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]\\resources\\fileutil.py", + "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], diff --git a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json index 126ea2489a..62182a1f39 100644 --- a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json +++ b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json @@ -456,7 +456,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json index 9d907de7cb..9e51944319 100644 --- a/infra/bots/recipes/test.expected/failed_dm.json +++ b/infra/bots/recipes/test.expected/failed_dm.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/failed_get_hashes.json b/infra/bots/recipes/test.expected/failed_get_hashes.json index 0a5aec9612..2610d7a8a2 100644 --- a/infra/bots/recipes/test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/test.expected/failed_get_hashes.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json index edf16fe6a9..3727d80d96 100644 --- a/infra/bots/recipes/test.expected/failed_pull.json +++ b/infra/bots/recipes/test.expected/failed_pull.json @@ -494,7 +494,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json index 4b2e35683c..a2654935b7 100644 --- a/infra/bots/recipes/test.expected/trybot.json +++ b/infra/bots/recipes/test.expected/trybot.json @@ -69,7 +69,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", + "RECIPE_MODULE[skia::file]/resources/fileutil.py", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index c4eaff160a..ac53e89d95 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -7,9 +7,9 @@ DEPS = [ - 'build/file', 'core', 'env', + 'file', 'flavor', 'recipe_engine/context', 'recipe_engine/json', diff --git a/infra/bots/recipes/update_meta_config.py b/infra/bots/recipes/update_meta_config.py index 3c6086c2f5..a3ca4f6ddd 100644 --- a/infra/bots/recipes/update_meta_config.py +++ b/infra/bots/recipes/update_meta_config.py @@ -7,8 +7,8 @@ DEPS = [ - 'build/file', 'depot_tools/gclient', + 'file', 'recipe_engine/context', 'recipe_engine/path', 'recipe_engine/properties', diff --git a/infra/bots/recipes/upload_dm_results.py b/infra/bots/recipes/upload_dm_results.py index 562d6e589d..d919f59077 100644 --- a/infra/bots/recipes/upload_dm_results.py +++ b/infra/bots/recipes/upload_dm_results.py @@ -10,7 +10,7 @@ import calendar DEPS = [ - 'build/file', + 'file', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/properties', diff --git a/infra/bots/recipes/upload_nano_results.py b/infra/bots/recipes/upload_nano_results.py index 20a723b093..1bf4ef1d54 100644 --- a/infra/bots/recipes/upload_nano_results.py +++ b/infra/bots/recipes/upload_nano_results.py @@ -7,7 +7,7 @@ DEPS = [ - 'build/file', + 'file', 'recipe_engine/context', 'recipe_engine/path', 'recipe_engine/properties', |