Index: infra/bots/tasks.json |
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json |
index d595c317643cc5f19a65ab7204c7442ecd28812c..dc9bc5ba538249bb6c0d3f1a3ced82afcb63807f 100644 |
--- a/infra/bots/tasks.json |
+++ b/infra/bots/tasks.json |
@@ -1,12 +1,36 @@ |
{ |
+ "jobs": { |
+ "Build-Ubuntu-GCC-x86_64-Release-GN": { |
+ "priority": 0.8, |
+ "tasks": [ |
+ "Build-Ubuntu-GCC-x86_64-Release-GN" |
+ ] |
+ }, |
+ "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
+ "priority": 0.8, |
+ "tasks": [ |
+ "Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN" |
+ ] |
+ }, |
+ "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
+ "priority": 0.8, |
+ "tasks": [ |
+ "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN" |
+ ] |
+ } |
+ }, |
"tasks": { |
"Build-Ubuntu-GCC-x86_64-Release-GN": { |
- "cipd_packages": [], |
- "dependencies": [], |
- "dimensions": ["pool:Skia", "os:Ubuntu", "gpu:none"], |
+ "dimensions": [ |
+ "gpu:none", |
+ "os:Ubuntu", |
+ "pool:Skia" |
+ ], |
"extra_args": [ |
- "--workdir", "../../..", "swarm_compile", |
- "buildername=<(TASK_NAME)", |
+ "--workdir", |
+ "../../..", |
+ "swarm_compile", |
+ "buildername=Build-Ubuntu-GCC-x86_64-Release-GN", |
"mastername=fake-master", |
"buildnumber=2", |
"slavename=fake-buildslave", |
@@ -16,110 +40,135 @@ |
"isolate": "compile_skia.isolate", |
"priority": 0.8 |
}, |
- "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
- "cipd_packages": [{ |
- "name": "skia/bots/skimage", |
- "path": "skimage", |
- "version": "version:4" |
- }, |
- { |
- "name": "skia/bots/skp", |
- "path": "skp", |
- "version": "version:6" |
- }, |
- { |
- "name": "skia/bots/svg", |
- "path": "svg", |
- "version": "version:1" |
- }], |
- "dependencies": ["Build-Ubuntu-GCC-x86_64-Release-GN"], |
- "dimensions": ["pool:Skia", "os:Ubuntu", "cpu:x86-64-avx2", "gpu:none"], |
+ "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
+ "cipd_packages": [ |
+ { |
+ "name": "skia/bots/skimage", |
+ "path": "skimage", |
+ "version": "version:8" |
+ }, |
+ { |
+ "name": "skia/bots/skp", |
+ "path": "skp", |
+ "version": "version:10" |
+ }, |
+ { |
+ "name": "skia/bots/svg", |
+ "path": "svg", |
+ "version": "version:3" |
+ } |
+ ], |
+ "dependencies": [ |
+ "Build-Ubuntu-GCC-x86_64-Release-GN" |
+ ], |
+ "dimensions": [ |
+ "cpu:x86-64-avx2", |
+ "gpu:none", |
+ "os:Ubuntu", |
+ "pool:Skia" |
+ ], |
"extra_args": [ |
- "--workdir", "../../..", "swarm_test", |
- "buildername=<(TASK_NAME)", |
+ "--workdir", |
+ "../../..", |
+ "swarm_perf", |
+ "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN", |
"mastername=fake-master", |
"buildnumber=2", |
"slavename=fake-buildslave", |
"swarm_out_dir=${ISOLATED_OUTDIR}", |
"revision=<(REVISION)" |
], |
- "isolate": "test_skia.isolate", |
+ "isolate": "perf_skia.isolate", |
"priority": 0.8 |
}, |
- "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
- "cipd_packages": [], |
- "dependencies": ["Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"], |
- "dimensions": ["pool:Skia", "os:Ubuntu", "cpu:x86-64-avx2", "gpu:none"], |
+ "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
+ "cipd_packages": [ |
+ { |
+ "name": "skia/bots/skimage", |
+ "path": "skimage", |
+ "version": "version:8" |
+ }, |
+ { |
+ "name": "skia/bots/skp", |
+ "path": "skp", |
+ "version": "version:10" |
+ }, |
+ { |
+ "name": "skia/bots/svg", |
+ "path": "svg", |
+ "version": "version:3" |
+ } |
+ ], |
+ "dependencies": [ |
+ "Build-Ubuntu-GCC-x86_64-Release-GN" |
+ ], |
+ "dimensions": [ |
+ "cpu:x86-64-avx2", |
+ "gpu:none", |
+ "os:Ubuntu", |
+ "pool:Skia" |
+ ], |
"extra_args": [ |
- "--workdir", "../../..", "upload_dm_results", |
+ "--workdir", |
+ "../../..", |
+ "swarm_test", |
"buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN", |
"mastername=fake-master", |
"buildnumber=2", |
- "revision=<(REVISION)", |
"slavename=fake-buildslave", |
- "swarm_out_dir=${ISOLATED_OUTDIR}" |
+ "swarm_out_dir=${ISOLATED_OUTDIR}", |
+ "revision=<(REVISION)" |
], |
- "isolate": "upload_dm_results.isolate", |
+ "isolate": "test_skia.isolate", |
"priority": 0.8 |
}, |
- "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
- "cipd_packages": [{ |
- "name": "skia/bots/skimage", |
- "path": "skimage", |
- "version": "version:4" |
- }, |
- { |
- "name": "skia/bots/skp", |
- "path": "skp", |
- "version": "version:6" |
- }, |
- { |
- "name": "skia/bots/svg", |
- "path": "svg", |
- "version": "version:1" |
- }], |
- "dependencies": ["Build-Ubuntu-GCC-x86_64-Release-GN"], |
- "dimensions": ["pool:Skia", "os:Ubuntu", "cpu:x86-64-avx2", "gpu:none"], |
+ "Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
+ "dependencies": [ |
+ "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN" |
+ ], |
+ "dimensions": [ |
+ "cpu:x86-64-avx2", |
+ "gpu:none", |
+ "os:Ubuntu", |
+ "pool:Skia" |
+ ], |
"extra_args": [ |
- "--workdir", "../../..", "swarm_perf", |
- "buildername=<(TASK_NAME)", |
- "mastername=fake-master", |
+ "--workdir", |
+ "../../..", |
+ "upload_nano_results", |
+ "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN", |
+ "mastername=fake-master", |
"buildnumber=2", |
- "slavename=fake-buildslave", |
- "swarm_out_dir=${ISOLATED_OUTDIR}", |
+ "slavename=fake-buildslave", |
+ "swarm_out_dir=${ISOLATED_OUTDIR}", |
"revision=<(REVISION)" |
], |
- "isolate": "perf_skia.isolate", |
+ "isolate": "upload_nano_results.isolate", |
"priority": 0.8 |
}, |
- "Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
- "dependencies": ["Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"], |
- "dimensions": ["pool:Skia", "os:Ubuntu", "cpu:x86-64-avx2", "gpu:none"], |
- "extra_args": [ |
- "--workdir", "../../..", "upload_nano_results", |
- "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN", |
+ "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
+ "dependencies": [ |
+ "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN" |
+ ], |
+ "dimensions": [ |
+ "cpu:x86-64-avx2", |
+ "gpu:none", |
+ "os:Ubuntu", |
+ "pool:Skia" |
+ ], |
+ "extra_args": [ |
+ "--workdir", |
+ "../../..", |
+ "upload_dm_results", |
+ "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN", |
"mastername=fake-master", |
"buildnumber=2", |
- "revision=<(REVISION)", |
"slavename=fake-buildslave", |
- "swarm_out_dir=${ISOLATED_OUTDIR}" |
+ "swarm_out_dir=${ISOLATED_OUTDIR}", |
+ "revision=<(REVISION)" |
], |
- "isolate": "upload_nano_results.isolate", |
+ "isolate": "upload_dm_results.isolate", |
"priority": 0.8 |
} |
- }, |
- "jobs": { |
- "Build-Ubuntu-GCC-x86_64-Release-GN": { |
- "priority": 0.8, |
- "tasks": ["Build-Ubuntu-GCC-x86_64-Release-GN"] |
- }, |
- "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
- "priority": 0.8, |
- "tasks": ["Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"] |
- }, |
- "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": { |
- "priority": 0.8, |
- "tasks": ["Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"] |
- } |
} |
-} |
+} |