[task scheduler] Add uploads to tasks.json

infra/bots/tasks.json

Index: infra/bots/tasks.json
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 79c55f0add95a0c380f9a455cde52519217d5f1d..f999ad5128fde26b4c2415083ef9ff1168877389 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -46,6 +46,22 @@
       "isolate": "test_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"],

[dogben, 2016/09/27 14:25:28]

Why do we need avx2?

Same question for Perf.

[borenet, 2016/09/27 14:27:49]

Just to be extra sure we're targeting a GCE instance.

+      "extra_args": [
+        "--workdir",  "../../..", "upload_dm_results",
+        "buildername=<(TASK_NAME)",

[dogben, 2016/09/27 14:25:28]

Is this expecting Upload-... as the buildername?

Same question for Perf.

[borenet, 2016/09/27 14:27:49]

No, it's the builder name whose results we're uploading.

[dogben, 2016/09/27 14:30:46]

So, won't <(TASK_NAME) expand to
Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN in this case?

[borenet, 2016/09/27 14:47:27]

D'oh. Yeah. Made the recipe trim the "Upload-" prefix if it exists.

+        "mastername=fake-master",
+        "buildnumber=2",
+        "revision=<(REVISION)",
+        "slavename=fake-buildslave",
+        "swarm_out_dir=${ISOLATED_OUTDIR}"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
     "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
       "cipd_packages": [{
         "name": "skia/bots/skimage",
@@ -75,6 +91,21 @@
       ],
       "isolate": "perf_skia.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=<(TASK_NAME)",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "revision=<(REVISION)",
+        "slavename=fake-buildslave",
+        "swarm_out_dir=${ISOLATED_OUTDIR}"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
     }
   },
   "jobs": {
@@ -84,11 +115,11 @@
     },
     "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
       "priority": 0.8,
-      "tasks": ["Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"]
+      "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": ["Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"]
+      "tasks": ["Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"]
     }
   }
 }