From f94514b0ff8eccb2eaef8c77bee8c5f462b83b90 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Mon, 22 May 2017 08:35:36 -0400 Subject: [recipes] Copy file, isolate, swarming, swarming_client from build.git Rename swarming -> skia_swarming. Some required heavy modification to remove other dependencies on modules in build.git. Expected changes: - RECIPE_MODULE[build::] -> RECIPE_MODULE[skia::] - No more runit; directly run through Python. Bug: skia:6628 Change-Id: I1b1370ed387966222ce10731771dbde9020cf542 Reviewed-on: https://skia-review.googlesource.com/17448 Commit-Queue: Eric Boren Reviewed-by: Ravi Mistry --- .../ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json | 56 +++++++--------------- 1 file changed, 18 insertions(+), 38 deletions(-) (limited to 'infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json') 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", "[]", "--", -- cgit v1.2.3