aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
authorGravatar Ravi Mistry <rmistry@google.com>2018-01-08 12:11:41 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-01-08 17:39:21 +0000
commit7b7d9b374d62c4be5d439a3a1dd761b9ef4b3052 (patch)
tree60ca90d11a2cba28aa36e5401e8de0d52ebfb812 /infra
parent95448a90c1e168f5d36abab40dc762b2602ba75a (diff)
Point ct_skps.py recipe to new SKP repository
Bug: skia:7463 Change-Id: I5dd17a5ba33f867346837f006f9dc4cb775cfa04 Reviewed-on: https://skia-review.googlesource.com/91960 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'infra')
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json168
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json148
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json148
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json148
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json148
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json152
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json150
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json168
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json168
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json148
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json148
-rw-r--r--infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json148
-rw-r--r--infra/bots/recipes/ct_skps.py8
13 files changed, 925 insertions, 925 deletions
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 47624b4669..f104701d6e 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
@@ -370,7 +370,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -395,7 +395,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -410,7 +410,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -420,17 +420,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -457,7 +457,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json"
],
"infra_step": true,
@@ -471,7 +471,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -486,7 +486,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -496,17 +496,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json"
],
"infra_step": true,
@@ -547,7 +547,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -562,7 +562,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -572,17 +572,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -609,7 +609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json"
],
"infra_step": true,
@@ -623,7 +623,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -638,7 +638,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -648,17 +648,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -685,7 +685,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json"
],
"infra_step": true,
@@ -699,7 +699,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -714,7 +714,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -724,17 +724,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -761,7 +761,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json"
],
"infra_step": true,
@@ -775,11 +775,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
@@ -1255,7 +1255,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1270,7 +1270,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1381,7 +1381,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1396,7 +1396,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1507,7 +1507,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1522,7 +1522,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1633,7 +1633,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1648,7 +1648,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1759,7 +1759,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1774,7 +1774,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
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 f4f2ae59ac..731990ff3b 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
@@ -370,7 +370,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -395,7 +395,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -410,7 +410,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -420,17 +420,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -457,7 +457,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"100k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json"
],
"infra_step": true,
@@ -471,7 +471,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -486,7 +486,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -496,17 +496,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"100k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json"
],
"infra_step": true,
@@ -547,7 +547,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -562,7 +562,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -572,17 +572,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -609,7 +609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"100k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json"
],
"infra_step": true,
@@ -623,7 +623,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -638,7 +638,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -648,17 +648,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -685,7 +685,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"100k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json"
],
"infra_step": true,
@@ -699,7 +699,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -714,7 +714,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -724,17 +724,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -761,7 +761,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"100k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json"
],
"infra_step": true,
@@ -775,11 +775,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"100k\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
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 cda326fbbe..8cb47853f3 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
@@ -370,7 +370,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -395,7 +395,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -410,7 +410,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -420,17 +420,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -457,7 +457,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json"
],
"infra_step": true,
@@ -471,7 +471,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -486,7 +486,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -496,17 +496,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json"
],
"infra_step": true,
@@ -547,7 +547,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -562,7 +562,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -572,17 +572,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -609,7 +609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json"
],
"infra_step": true,
@@ -623,7 +623,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -638,7 +638,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -648,17 +648,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -685,7 +685,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json"
],
"infra_step": true,
@@ -699,7 +699,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -714,7 +714,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -724,17 +724,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -761,7 +761,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json"
],
"infra_step": true,
@@ -775,11 +775,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
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 053c4a4f2a..c7fe801770 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
@@ -374,7 +374,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -399,7 +399,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -414,7 +414,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -424,17 +424,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -461,7 +461,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json"
],
"infra_step": true,
@@ -475,7 +475,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -490,7 +490,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -500,17 +500,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -537,7 +537,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json"
],
"infra_step": true,
@@ -551,7 +551,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -566,7 +566,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -576,17 +576,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -613,7 +613,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json"
],
"infra_step": true,
@@ -627,7 +627,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -642,7 +642,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -652,17 +652,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -689,7 +689,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json"
],
"infra_step": true,
@@ -703,7 +703,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -718,7 +718,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -728,17 +728,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -765,7 +765,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json"
],
"infra_step": true,
@@ -779,11 +779,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
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 ad4ebe2d88..453d06d676 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
@@ -370,7 +370,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -395,7 +395,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -410,7 +410,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -420,17 +420,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -457,7 +457,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json"
],
"infra_step": true,
@@ -471,7 +471,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -486,7 +486,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -496,17 +496,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json"
],
"infra_step": true,
@@ -547,7 +547,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -562,7 +562,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -572,17 +572,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -609,7 +609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json"
],
"infra_step": true,
@@ -623,7 +623,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -638,7 +638,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -648,17 +648,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -685,7 +685,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json"
],
"infra_step": true,
@@ -699,7 +699,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -714,7 +714,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -724,17 +724,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -761,7 +761,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json"
],
"infra_step": true,
@@ -775,11 +775,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"All\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
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 078116579e..e2cb9d6c6f 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
@@ -370,7 +370,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -395,7 +395,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -410,7 +410,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -420,17 +420,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -457,7 +457,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json"
],
"infra_step": true,
@@ -471,7 +471,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -486,7 +486,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -496,17 +496,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json"
],
"infra_step": true,
@@ -547,7 +547,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -562,7 +562,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -572,17 +572,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -609,7 +609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json"
],
"infra_step": true,
@@ -623,7 +623,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -638,7 +638,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -648,17 +648,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -685,7 +685,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json"
],
"infra_step": true,
@@ -699,7 +699,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -714,7 +714,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -724,17 +724,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -761,7 +761,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json"
],
"infra_step": true,
@@ -775,11 +775,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"All\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
@@ -1230,7 +1230,7 @@
"@@@STEP_LINK@shard #0 isolated out@blah@@@",
"@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@",
"@@@STEP_LINK@Webpage rankings@https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv@@@",
- "@@@STEP_LINK@Download SKPs by rank@https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/@@@",
+ "@@@STEP_LINK@Download SKPs by rank@https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/@@@",
"@@@STEP_FAILURE@@@"
]
},
@@ -1388,7 +1388,7 @@
"@@@STEP_LINK@shard #0 isolated out@blah@@@",
"@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@",
"@@@STEP_LINK@Webpage rankings@https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv@@@",
- "@@@STEP_LINK@Download SKPs by rank@https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/@@@",
+ "@@@STEP_LINK@Download SKPs by rank@https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/@@@",
"@@@STEP_FAILURE@@@"
]
},
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 62280c6307..21c1fd6f81 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
@@ -370,7 +370,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -395,7 +395,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -410,7 +410,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -420,17 +420,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -457,7 +457,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json"
],
"infra_step": true,
@@ -471,7 +471,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -486,7 +486,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -496,17 +496,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json"
],
"infra_step": true,
@@ -547,7 +547,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -562,7 +562,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -572,17 +572,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -609,7 +609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json"
],
"infra_step": true,
@@ -623,7 +623,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -638,7 +638,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -648,17 +648,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -685,7 +685,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json"
],
"infra_step": true,
@@ -699,7 +699,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -714,7 +714,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -724,17 +724,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -761,7 +761,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json"
],
"infra_step": true,
@@ -775,11 +775,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"All\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/All/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
@@ -1384,7 +1384,7 @@
"@@@STEP_LINK@shard #0 isolated out@blah@@@",
"@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@",
"@@@STEP_LINK@Webpage rankings@https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv@@@",
- "@@@STEP_LINK@Download SKPs by rank@https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/@@@",
+ "@@@STEP_LINK@Download SKPs by rank@https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/@@@",
"@@@STEP_FAILURE@@@"
]
},
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 e625664477..6b08787314 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
@@ -370,7 +370,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -395,7 +395,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -410,7 +410,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -420,17 +420,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -457,7 +457,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json"
],
"infra_step": true,
@@ -471,7 +471,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -486,7 +486,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -496,17 +496,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json"
],
"infra_step": true,
@@ -547,7 +547,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -562,7 +562,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -572,17 +572,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -609,7 +609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json"
],
"infra_step": true,
@@ -623,7 +623,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -638,7 +638,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -648,17 +648,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -685,7 +685,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json"
],
"infra_step": true,
@@ -699,7 +699,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -714,7 +714,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -724,17 +724,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -761,7 +761,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json"
],
"infra_step": true,
@@ -775,11 +775,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
@@ -1270,7 +1270,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1285,7 +1285,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1396,7 +1396,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1411,7 +1411,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1522,7 +1522,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1537,7 +1537,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1648,7 +1648,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1663,7 +1663,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1774,7 +1774,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1789,7 +1789,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
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 c296e93ef7..00a0797156 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
@@ -370,7 +370,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -395,7 +395,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -410,7 +410,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -420,17 +420,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -457,7 +457,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json"
],
"infra_step": true,
@@ -471,7 +471,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -486,7 +486,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -496,17 +496,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json"
],
"infra_step": true,
@@ -547,7 +547,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -562,7 +562,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -572,17 +572,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -609,7 +609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json"
],
"infra_step": true,
@@ -623,7 +623,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -638,7 +638,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -648,17 +648,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -685,7 +685,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json"
],
"infra_step": true,
@@ -699,7 +699,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -714,7 +714,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -724,17 +724,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -761,7 +761,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu14-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json"
],
"infra_step": true,
@@ -775,11 +775,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
@@ -1270,7 +1270,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1285,7 +1285,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1396,7 +1396,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1411,7 +1411,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1522,7 +1522,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1537,7 +1537,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1648,7 +1648,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1663,7 +1663,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1774,7 +1774,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -1789,7 +1789,7 @@
"cp",
"-R",
"[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2",
- "gs://skia-perf/ct/10k/2012/05/14/12/"
+ "gs://skia-perf/ct/All/2012/05/14/12/"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
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 3cea5491e7..c68965eb37 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
@@ -370,7 +370,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -395,7 +395,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -410,7 +410,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -420,17 +420,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -457,7 +457,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"100k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json"
],
"infra_step": true,
@@ -471,7 +471,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -486,7 +486,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -496,17 +496,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"100k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json"
],
"infra_step": true,
@@ -547,7 +547,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -562,7 +562,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -572,17 +572,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -609,7 +609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"100k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json"
],
"infra_step": true,
@@ -623,7 +623,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -638,7 +638,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -648,17 +648,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -685,7 +685,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"100k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json"
],
"infra_step": true,
@@ -699,7 +699,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -714,7 +714,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -724,17 +724,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -761,7 +761,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"100k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json"
],
"infra_step": true,
@@ -775,11 +775,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"100k\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/100k/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
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 fc122c4595..d6cb4e7353 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
@@ -370,7 +370,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -395,7 +395,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -410,7 +410,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -420,17 +420,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -457,7 +457,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json"
],
"infra_step": true,
@@ -471,7 +471,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -486,7 +486,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -496,17 +496,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json"
],
"infra_step": true,
@@ -547,7 +547,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -562,7 +562,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -572,17 +572,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -609,7 +609,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json"
],
"infra_step": true,
@@ -623,7 +623,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -638,7 +638,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -648,17 +648,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -685,7 +685,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json"
],
"infra_step": true,
@@ -699,7 +699,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -714,7 +714,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -724,17 +724,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -761,7 +761,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json"
],
"infra_step": true,
@@ -775,11 +775,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
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 1fded5f8b9..f834bcd279 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
@@ -374,7 +374,7 @@
"infra_step": true,
"name": "Copy Go binary",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@",
+ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/\"@@@",
"@@@SET_BUILD_PROPERTY@Webpage rankings@\"https://storage.cloud.google.com/cluster-telemetry/csv/top-1m.csv\"@@@"
]
},
@@ -399,7 +399,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "rmtree slave1"
@@ -414,7 +414,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"infra_step": true,
"name": "makedirs slave1"
@@ -424,17 +424,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/1/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/2/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/3/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/4/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/5/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/6/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/7/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/8/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/9/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/10/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave1"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/1/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/2/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/3/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/4/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/5/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/6/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/7/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/8/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/9/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/10/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave1"
],
"name": "gsutil cp"
},
@@ -461,7 +461,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json"
],
"infra_step": true,
@@ -475,7 +475,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "rmtree slave2"
@@ -490,7 +490,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"infra_step": true,
"name": "makedirs slave2"
@@ -500,17 +500,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/11/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/12/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/13/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/14/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/15/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/16/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/17/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/18/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/19/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/20/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave2"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/11/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/12/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/13/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/14/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/15/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/16/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/17/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/18/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/19/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/20/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave2"
],
"name": "gsutil cp (2)"
},
@@ -537,7 +537,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json"
],
"infra_step": true,
@@ -551,7 +551,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "rmtree slave3"
@@ -566,7 +566,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"infra_step": true,
"name": "makedirs slave3"
@@ -576,17 +576,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/21/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/22/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/23/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/24/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/25/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/26/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/27/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/28/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/29/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/30/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave3"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/21/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/22/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/23/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/24/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/25/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/26/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/27/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/28/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/29/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/30/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave3"
],
"name": "gsutil cp (3)"
},
@@ -613,7 +613,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json"
],
"infra_step": true,
@@ -627,7 +627,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "rmtree slave4"
@@ -642,7 +642,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"infra_step": true,
"name": "makedirs slave4"
@@ -652,17 +652,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/31/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/32/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/33/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/34/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/35/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/36/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/37/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/38/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/39/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/40/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave4"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/31/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/32/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/33/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/34/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/35/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/36/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/37/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/38/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/39/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/40/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave4"
],
"name": "gsutil cp (4)"
},
@@ -689,7 +689,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json"
],
"infra_step": true,
@@ -703,7 +703,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "rmtree slave5"
@@ -718,7 +718,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"infra_step": true,
"name": "makedirs slave5"
@@ -728,17 +728,17 @@
"gsutil",
"-m",
"cp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/41/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/42/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/43/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/44/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/45/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/46/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/47/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/48/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/49/*.skp",
- "gs://cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/50/*.skp",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/slave5"
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/41/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/42/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/43/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/44/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/45/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/46/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/47/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/48/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/49/*.skp",
+ "gs://cluster-telemetry/swarming/skps/All/2b7e85eb251dc7-a3cf3659ed2c08/50/*.skp",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/slave5"
],
"name": "gsutil cp (5)"
},
@@ -765,7 +765,7 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"10k\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"c37e844a6f8708-eee762104c75bd\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"NUM_SLAVES\", \n \"5\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"PAGE_TYPE\", \n \"All\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\", \n \"--extra-variable\", \n \"CHROMIUM_BUILD\", \n \"2b7e85eb251dc7-a3cf3659ed2c08\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json"
],
"infra_step": true,
@@ -779,11 +779,11 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}",
- "[CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "{\"chromium_build\": \"2b7e85eb251dc7-a3cf3659ed2c08\", \"num_slaves\": 5, \"page_type\": \"All\"}",
+ "[CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
],
"infra_step": true,
- "name": "Create [CUSTOM_/_B_WORK]/skps/c37e844a6f8708-eee762104c75bd/10k/5/skps_version"
+ "name": "Create [CUSTOM_/_B_WORK]/skps/2b7e85eb251dc7-a3cf3659ed2c08/All/5/skps_version"
},
{
"cmd": [
diff --git a/infra/bots/recipes/ct_skps.py b/infra/bots/recipes/ct_skps.py
index af4eb0809d..398b40617f 100644
--- a/infra/bots/recipes/ct_skps.py
+++ b/infra/bots/recipes/ct_skps.py
@@ -37,20 +37,20 @@ TOOL_TO_DEFAULT_SKPS_PER_SLAVE = {
}
# The SKP repository to use.
-DEFAULT_SKPS_CHROMIUM_BUILD = 'c37e844a6f8708-eee762104c75bd'
+DEFAULT_SKPS_CHROMIUM_BUILD = '2b7e85eb251dc7-a3cf3659ed2c08'
def RunSteps(api):
# Figure out which repository to use.
buildername = api.properties['buildername']
if '1k' in buildername:
- ct_page_type = '10k'
+ ct_page_type = 'All'
num_pages = 1000
elif '10k' in buildername:
- ct_page_type = '10k'
+ ct_page_type = 'All'
num_pages = 10000
elif '100k' in buildername:
- ct_page_type = '100k'
+ ct_page_type = 'All'
num_pages = 100000
elif '1m' in buildername:
ct_page_type = 'All'