Add dimension to differentiate Golo from Skolo for Android tasks

Bug: skia:
NOTRY=true
Change-Id: Ice619a9eed43bc3b1ecd54f1851f527bd0623cd2
Reviewed-on: https://skia-review.googlesource.com/81380
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Eric Boren <borenet@google.com>

2 files changed, 193 insertions, 96 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index bfb07670cf..a9b8c024a9 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -238,6 +238,7 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 			}
 			d["device_type"] = deviceInfo[0]
 			d["device_os"] = deviceInfo[1]
+			d["python"] = "2.7.9" // This indicates a RPI, e.g. in Skolo.  Golo is 2.7.12
 		} else if strings.Contains(parts["os"], "iOS") {
 			device, ok := map[string]string{
 				"iPadMini4": "iPad5,1",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 0eba2c7032..ea89cf7a34 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -5413,7 +5413,8 @@
         "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5447,7 +5448,8 @@
         "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5481,7 +5483,8 @@
         "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5515,7 +5518,8 @@
         "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5549,7 +5553,8 @@
         "device_os:NRD90M_G930AUCS4BQC2",
         "device_type:heroqlteatt",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5583,7 +5588,8 @@
         "device_os:NRD90M_G930AUCS4BQC2",
         "device_type:heroqlteatt",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5617,7 +5623,8 @@
         "device_os:NRD90M_G930FXXU1DQAS",
         "device_type:herolte",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5651,7 +5658,8 @@
         "device_os:NRD90M_G930FXXU1DQAS",
         "device_type:herolte",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5685,7 +5693,8 @@
         "device_os:NPJ25.93-14",
         "device_type:athene",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5719,7 +5728,8 @@
         "device_os:NPJ25.93-14",
         "device_type:athene",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5753,7 +5763,8 @@
         "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5787,7 +5798,8 @@
         "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5821,7 +5833,8 @@
         "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5855,7 +5868,8 @@
         "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5889,7 +5903,8 @@
         "device_os:LMY49J",
         "device_type:manta",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5923,7 +5938,8 @@
         "device_os:LMY49J",
         "device_type:manta",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5957,7 +5973,8 @@
         "device_os:M4B30Z",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -5991,7 +6008,8 @@
         "device_os:M4B30Z",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6025,7 +6043,8 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6059,7 +6078,8 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6093,7 +6113,8 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6127,7 +6148,8 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6161,7 +6183,8 @@
         "device_os:LMY47V",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6195,7 +6218,8 @@
         "device_os:LMY47V",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6229,7 +6253,8 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -6263,7 +6288,8 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -6297,7 +6323,8 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -6331,7 +6358,8 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6365,7 +6393,8 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6399,7 +6428,8 @@
         "device_os:OPR3.170623.008",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6433,7 +6463,8 @@
         "device_os:OPR3.170623.008",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6467,7 +6498,8 @@
         "device_os:OPR3.170623.008",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6499,7 +6531,8 @@
         "device_os:OPR3.170623.008",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6531,7 +6564,8 @@
         "device_os:OPR3.170623.008",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6565,7 +6599,8 @@
         "device_os:OPR3.170623.008",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6597,7 +6632,8 @@
         "device_os:OPR3.170623.008",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6631,7 +6667,8 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6665,7 +6702,8 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6699,7 +6737,8 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6733,7 +6772,8 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6767,7 +6807,8 @@
         "device_os:OPR1.170623.034",
         "device_type:dragon",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6801,7 +6842,8 @@
         "device_os:OPR1.170623.034",
         "device_type:dragon",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6833,7 +6875,8 @@
         "device_os:OPR1.170623.034",
         "device_type:dragon",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6865,7 +6908,8 @@
         "device_os:OPR1.170623.034",
         "device_type:dragon",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6897,7 +6941,8 @@
         "device_os:OPR1.170623.034",
         "device_type:dragon",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7337,7 +7382,8 @@
         "device_os:1.24_82923",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7369,7 +7415,8 @@
         "device_os:1.24_82923",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7401,7 +7448,8 @@
         "device_os:1.24_82923",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7433,7 +7481,8 @@
         "device_os:1.24_82923",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -12920,7 +12969,8 @@
         "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -12955,7 +13005,8 @@
         "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -12990,7 +13041,8 @@
         "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13025,7 +13077,8 @@
         "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13060,7 +13113,8 @@
         "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13095,7 +13149,8 @@
         "device_os:NRD90M_G930AUCS4BQC2",
         "device_type:heroqlteatt",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13130,7 +13185,8 @@
         "device_os:NRD90M_G930AUCS4BQC2",
         "device_type:heroqlteatt",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13165,7 +13221,8 @@
         "device_os:NRD90M_G930FXXU1DQAS",
         "device_type:herolte",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13200,7 +13257,8 @@
         "device_os:NRD90M_G930FXXU1DQAS",
         "device_type:herolte",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13235,7 +13293,8 @@
         "device_os:NPJ25.93-14",
         "device_type:athene",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13270,7 +13329,8 @@
         "device_os:NPJ25.93-14",
         "device_type:athene",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13305,7 +13365,8 @@
         "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13340,7 +13401,8 @@
         "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13375,7 +13437,8 @@
         "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13410,7 +13473,8 @@
         "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13445,7 +13509,8 @@
         "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13480,7 +13545,8 @@
         "device_os:LMY49J",
         "device_type:manta",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13515,7 +13581,8 @@
         "device_os:LMY49J",
         "device_type:manta",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13550,7 +13617,8 @@
         "device_os:M4B30Z",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13585,7 +13653,8 @@
         "device_os:M4B30Z",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13620,7 +13689,8 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13655,7 +13725,8 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13690,7 +13761,8 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13725,7 +13797,8 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13760,7 +13833,8 @@
         "device_os:LMY47V",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13795,7 +13869,8 @@
         "device_os:LMY47V",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13830,7 +13905,8 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -13865,7 +13941,8 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -13900,7 +13977,8 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -13935,7 +14013,8 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -13970,7 +14049,8 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14005,7 +14085,8 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14040,7 +14121,8 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14075,7 +14157,8 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14110,7 +14193,8 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14145,7 +14229,8 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14180,7 +14265,8 @@
         "device_os:OPR1.170623.034",
         "device_type:dragon",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14215,7 +14301,8 @@
         "device_os:OPR1.170623.034",
         "device_type:dragon",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14250,7 +14337,8 @@
         "device_os:OPR3.170623.008",
         "device_type:marlin",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14285,7 +14373,8 @@
         "device_os:OPR3.170623.008",
         "device_type:marlin",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14320,7 +14409,8 @@
         "device_os:OPR3.170623.008",
         "device_type:marlin",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14355,7 +14445,8 @@
         "device_os:OPR3.170623.008",
         "device_type:marlin",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14390,7 +14481,8 @@
         "device_os:OPR3.170623.008",
         "device_type:marlin",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14843,7 +14935,8 @@
         "device_os:1.24_82923",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14876,7 +14969,8 @@
         "device_os:1.24_82923",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14909,7 +15003,8 @@
         "device_os:1.24_82923",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -14942,7 +15037,8 @@
         "device_os:1.24_82923",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia"
+        "pool:Skia",
+        "python:2.7.9"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,