Index: infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json |
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json |
similarity index 94% |
copy from infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json |
copy to infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json |
index d1f052d2283d79912a5f2d0b86651f46fef5c15a..cdf2291ee63c4c44f9d7e8c409a694f54dc53f75 100644 |
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json |
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json |
@@ -4,7 +4,7 @@ |
"python", |
"-u", |
"\nimport json\nimport sys\n\nwith open(sys.argv[1]) as f:\n content = json.load(f)\n\nprint json.dumps(content, indent=2)\n", |
- "{\"buildername\": \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}" |
+ "{\"buildername\": \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}" |
], |
"name": "print properties", |
"~followup_annotations": [ |
@@ -327,7 +327,7 @@ |
"--shards", |
"1", |
"--task-name", |
- "compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5", |
+ "compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5", |
"--dump-json", |
"/path/to/tmp/json", |
"--expiration", |
@@ -348,7 +348,7 @@ |
"--tag", |
"allow_milo:1", |
"--tag", |
- "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug", |
+ "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared", |
"--tag", |
"buildnumber:5", |
"--tag", |
@@ -371,7 +371,7 @@ |
"--workdir", |
"../../..", |
"swarm_compile", |
- "buildername=Build-Ubuntu-GCC-x86_64-Debug", |
+ "buildername=Build-Ubuntu-GCC-x86_64-Release-Shared", |
"mastername=client.skia.compile", |
"buildnumber=1", |
"slavename=skiabot-dummy-compile-slave", |
@@ -382,9 +382,9 @@ |
"name": "[trigger] compile_skia on Ubuntu", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", |
@@ -407,7 +407,7 @@ |
"--decorate", |
"--print-status-updates", |
"--json", |
- "{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", |
+ "{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", |
"--task-summary-json", |
"/path/to/tmp/json" |
], |
@@ -480,6 +480,16 @@ |
"cmd": [ |
"python", |
"-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", |
+ "/path/to/tmp/" |
+ ], |
+ "name": "read svg VERSION" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", |
"[SLAVE_BUILD]/swarming_temp_dir", |
"511" |
@@ -583,7 +593,7 @@ |
"--shards", |
"1", |
"--task-name", |
- "test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5", |
+ "test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5", |
"--dump-json", |
"/path/to/tmp/json", |
"--expiration", |
@@ -607,7 +617,7 @@ |
"--tag", |
"allow_milo:1", |
"--tag", |
- "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug", |
+ "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared", |
"--tag", |
"buildnumber:5", |
"--tag", |
@@ -628,12 +638,14 @@ |
"skp:skia/bots/skp:version:0", |
"--cipd-package", |
"skimage:skia/bots/skimage:version:0", |
+ "--cipd-package", |
+ "svg:skia/bots/svg:version:0", |
"def456", |
"--", |
"--workdir", |
"../../..", |
"swarm_test", |
- "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug", |
+ "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared", |
"mastername=client.skia", |
"buildnumber=5", |
"slavename=skiabot-linux-swarm-000", |
@@ -644,9 +656,9 @@ |
"name": "[trigger] test_skia on Ubuntu", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", |
@@ -691,7 +703,7 @@ |
"--decorate", |
"--print-status-updates", |
"--json", |
- "{\"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", \"tasks\": {\"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", |
+ "{\"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\", \"tasks\": {\"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", |
"--task-summary-json", |
"/path/to/tmp/json", |
"--task-output-dir", |
@@ -782,7 +794,7 @@ |
"RECIPE_MODULE[skia::core]/resources/upload_dm_results.py", |
"[SLAVE_BUILD]/dm", |
"abc123", |
- "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug", |
+ "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared", |
"5", |
"", |
"[SLAVE_BUILD]/skia/common/py/utils" |