chromeos_config: Run paygen for <board>-payloads-tryjobs

payload tryjobs should be able to run paygens.

BUG=chromium:898615
TEST=precq

Change-Id: I4673de0658a15fcfad0fdbf9da5f36314fa91c43
Reviewed-on: https://chromium-review.googlesource.com/1306376
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index 23b5b91..99b3e52 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -3599,7 +3599,6 @@
         # Generally make tryjobs safer.
         chroot_replace=True,
         debug=True,
-        paygen=False,
         push_image=False,
         # Force uprev. This is so patched in changes are always built.
         uprev=True,
@@ -3629,6 +3628,9 @@
     if build_name in cidb_unsafe or tryjob_config.master:
       tryjob_config.apply(debug_cidb=True)
 
+    if tryjob_config.build_type != constants.PAYLOADS_TYPE:
+      tryjob_config.apply(paygen=False)
+
     # Save off the new config so we can insert into site_config.
     tryjob_configs[tryjob_name] = tryjob_config
 
diff --git a/config/chromeos_config_unittest.py b/config/chromeos_config_unittest.py
index e2ce175..5c279a6 100644
--- a/config/chromeos_config_unittest.py
+++ b/config/chromeos_config_unittest.py
@@ -984,9 +984,10 @@
     """paygen testing requires upload_hw_test_artifacts."""
     for build_name, config in self.site_config.iteritems():
 
-      # This requirement doesn't apply to payloads builds. Payloads are
-      # using artifacts from a previous build.
-      if build_name.endswith('-payloads'):
+      # This requirement doesn't apply to payloads(-tryjob)
+      # builds. Payloads(-tryjob) are using artifacts from a previous build.
+      if build_name.endswith('-payloads') or \
+         build_name.endswith('-payloads-tryjob'):
         continue
 
       if config['paygen'] and not config['paygen_skip_testing']:
diff --git a/config/config_dump.json b/config/config_dump.json
index bdf56b9..e341ad7 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -1590,8 +1590,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "amd64-generic-cheets-pre-cq": {
         "_template": "pre_cq",
@@ -2656,8 +2655,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "arkham-pre-cq": {
         "_template": "pre_cq",
@@ -3717,8 +3715,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "asuka-pre-cq": {
         "_template": "pre_cq",
@@ -4234,8 +4231,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "atlas-pre-cq": {
         "_template": "pre_cq",
@@ -4754,8 +4750,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "auron_paine-pre-cq": {
         "_template": "pre_cq",
@@ -5273,8 +5268,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "auron_yuna-pre-cq": {
         "_template": "pre_cq",
@@ -5787,8 +5781,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "banjo-pre-cq": {
         "_template": "pre_cq",
@@ -6301,8 +6294,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "banon-pre-cq": {
         "_template": "pre_cq",
@@ -7639,8 +7631,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "betty-arc64-pre-cq": {
         "_template": "pre_cq",
@@ -8383,8 +8374,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "betty-arcnext-pi-android-pfq": {
         "_template": "pi_android_pfq",
@@ -9178,8 +9168,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "betty-pre-cq": {
         "_template": "pre_cq",
@@ -9881,8 +9870,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "bob-pre-cq": {
         "_template": "pre_cq",
@@ -10459,8 +10447,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "buddy-pre-cq": {
         "_template": "pre_cq",
@@ -10973,8 +10960,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "candy-pre-cq": {
         "_template": "pre_cq",
@@ -12419,8 +12405,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "caroline-arcnext-pi-android-pfq": {
         "_template": "pi_android_pfq",
@@ -13244,8 +13229,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "caroline-pre-cq": {
         "_template": "pre_cq",
@@ -14008,8 +13992,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "cave-pre-cq": {
         "_template": "pre_cq",
@@ -14533,8 +14516,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "celes-pre-cq": {
         "_template": "pre_cq",
@@ -15166,8 +15148,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "chell-pre-cq": {
         "_template": "pre_cq",
@@ -15911,8 +15892,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "cheza-pre-cq": {
         "_template": "pre_cq",
@@ -16645,8 +16625,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "clapper-pre-cq": {
         "_template": "pre_cq",
@@ -17583,8 +17562,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "coral-pre-cq": {
         "_template": "pre_cq",
@@ -18203,8 +18181,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "cyan-pre-cq": {
         "_template": "pre_cq",
@@ -18805,8 +18782,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "daisy-pre-cq": {
         "_template": "pre_cq",
@@ -19340,8 +19316,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "daisy_skate-pre-cq": {
         "_template": "pre_cq",
@@ -19858,8 +19833,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "daisy_spring-pre-cq": {
         "_template": "pre_cq",
@@ -20376,8 +20350,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "dragonegg-pre-cq": {
         "_template": "pre_cq",
@@ -20896,8 +20869,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "edgar-pre-cq": {
         "_template": "pre_cq",
@@ -21418,8 +21390,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "elm-pre-cq": {
         "_template": "pre_cq",
@@ -21957,8 +21928,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "enguarde-pre-cq": {
         "_template": "pre_cq",
@@ -22476,8 +22446,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "eve-arcnext-pi-android-pfq": {
         "_template": "pi_android_pfq",
@@ -23029,8 +22998,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "eve-arcvm-pre-cq": {
         "_template": "pre_cq",
@@ -23544,8 +23512,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "eve-campfire-pre-cq": {
         "_template": "pre_cq",
@@ -24298,8 +24265,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "eve-pre-cq": {
         "_template": "pre_cq",
@@ -25288,8 +25254,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "expresso-pre-cq": {
         "_template": "pre_cq",
@@ -25870,8 +25835,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "falco-pre-cq": {
         "_template": "pre_cq",
@@ -26384,8 +26348,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "falco_li-pre-cq": {
         "_template": "pre_cq",
@@ -28414,8 +28377,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "fizz-accelerator-pre-cq": {
         "_template": "pre_cq",
@@ -29102,8 +29064,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "fizz-moblab-pre-cq": {
         "_template": "pre_cq",
@@ -29467,8 +29428,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "fizz-pre-cq": {
         "_template": "pre_cq",
@@ -29969,8 +29929,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "gale-pre-cq": {
         "_template": "pre_cq",
@@ -30329,8 +30288,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "gandof-pre-cq": {
         "_template": "pre_cq",
@@ -30846,8 +30804,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "glados-pre-cq": {
         "_template": "pre_cq",
@@ -31357,8 +31314,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "glimmer-pre-cq": {
         "_template": "pre_cq",
@@ -31871,8 +31827,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "gnawty-pre-cq": {
         "_template": "pre_cq",
@@ -32729,8 +32684,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "gru-pre-cq": {
         "_template": "pre_cq",
@@ -33291,8 +33245,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "grunt-pi-android-pfq": {
         "_template": "pi_android_pfq",
@@ -33856,8 +33809,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "guado-accelerator-pre-cq": {
         "_template": "pre_cq",
@@ -34582,8 +34534,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "guado-pre-cq": {
         "_template": "pre_cq",
@@ -35096,8 +35047,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "guado_labstation-pre-cq": {
         "_template": "pre_cq",
@@ -35640,8 +35590,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "guado_moblab-pre-cq": {
         "_template": "pre_cq",
@@ -36234,8 +36183,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "hana-pre-cq": {
         "_template": "pre_cq",
@@ -36748,8 +36696,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "heli-pre-cq": {
         "_template": "pre_cq",
@@ -37313,8 +37260,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "jecht-pre-cq": {
         "_template": "pre_cq",
@@ -37829,8 +37775,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "kalista-pre-cq": {
         "_template": "pre_cq",
@@ -38359,8 +38304,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "kefka-pre-cq": {
         "_template": "pre_cq",
@@ -38887,8 +38831,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "kevin-arcnext-pi-android-pfq": {
         "_template": "pi_android_pfq",
@@ -39449,8 +39392,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "kevin-pre-cq": {
         "_template": "pre_cq",
@@ -40215,8 +40157,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "kip-pre-cq": {
         "_template": "pre_cq",
@@ -40742,8 +40683,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "kukui-pre-cq": {
         "_template": "pre_cq",
@@ -41468,8 +41408,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "lakitu-gpu-pre-cq": {
         "_template": "pre_cq",
@@ -42025,8 +41964,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "lakitu-nc-pre-cq": {
         "_template": "pre_cq",
@@ -42255,8 +42193,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "lakitu-pre-cq": {
         "_template": "pre_cq",
@@ -42717,8 +42654,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "lakitu-st-pre-cq": {
         "_template": "pre_cq",
@@ -43217,8 +43153,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "lakitu_next-pre-cq": {
         "_template": "pre_cq",
@@ -43612,8 +43547,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "lars-pre-cq": {
         "_template": "pre_cq",
@@ -44813,8 +44747,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "leon-pre-cq": {
         "_template": "pre_cq",
@@ -45383,8 +45316,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "link-pre-cq": {
         "_template": "pre_cq",
@@ -45986,8 +45918,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "lulu-pre-cq": {
         "_template": "pre_cq",
@@ -47873,8 +47804,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "mccloud-pre-cq": {
         "_template": "pre_cq",
@@ -48802,8 +48732,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "monroe-pre-cq": {
         "_template": "pre_cq",
@@ -49319,8 +49248,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "nami-pre-cq": {
         "_template": "pre_cq",
@@ -49872,8 +49800,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "nautilus-pre-cq": {
         "_template": "pre_cq",
@@ -50413,8 +50340,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "ninja-pre-cq": {
         "_template": "pre_cq",
@@ -50936,8 +50862,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "nocturne-pre-cq": {
         "_template": "pre_cq",
@@ -51452,8 +51377,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "novato-arc64-pre-cq": {
         "_template": "pre_cq",
@@ -51955,8 +51879,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "novato-pre-cq": {
         "_template": "pre_cq",
@@ -52465,8 +52388,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "nyan_big-pre-cq": {
         "_template": "pre_cq",
@@ -52988,8 +52910,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "nyan_blaze-pre-cq": {
         "_template": "pre_cq",
@@ -53568,8 +53489,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "nyan_kitty-pre-cq": {
         "_template": "pre_cq",
@@ -54088,8 +54008,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "oak-pre-cq": {
         "_template": "pre_cq",
@@ -54953,8 +54872,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "octopus-pre-cq": {
         "_template": "pre_cq",
@@ -55524,8 +55442,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "orco-pre-cq": {
         "_template": "pre_cq",
@@ -56041,8 +55958,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "panther-pre-cq": {
         "_template": "pre_cq",
@@ -56580,8 +56496,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "parrot_ivb-pre-cq": {
         "_template": "pre_cq",
@@ -57091,8 +57006,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "peach_pi-pre-cq": {
         "_template": "pre_cq",
@@ -57622,8 +57536,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "peach_pit-pre-cq": {
         "_template": "pre_cq",
@@ -58170,8 +58083,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "peppy-pre-cq": {
         "_template": "pre_cq",
@@ -58685,8 +58597,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "poppy-pre-cq": {
         "_template": "pre_cq",
@@ -59263,8 +59174,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "pyro-pre-cq": {
         "_template": "pre_cq",
@@ -59780,8 +59690,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "quawks-pre-cq": {
         "_template": "pre_cq",
@@ -60298,8 +60207,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "rammus-pre-cq": {
         "_template": "pre_cq",
@@ -60946,8 +60854,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "reef-pre-cq": {
         "_template": "pre_cq",
@@ -61479,8 +61386,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "reks-pre-cq": {
         "_template": "pre_cq",
@@ -62001,8 +61907,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "relm-pre-cq": {
         "_template": "pre_cq",
@@ -62515,8 +62420,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "rikku-pre-cq": {
         "_template": "pre_cq",
@@ -63468,8 +63372,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "samus-postsubmit": {
         "_template": "postsubmit",
@@ -64008,8 +63911,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "sand-pre-cq": {
         "_template": "pre_cq",
@@ -65029,8 +64931,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "scarlet-pre-cq": {
         "_template": "pre_cq",
@@ -65569,8 +65470,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "sentry-pre-cq": {
         "_template": "pre_cq",
@@ -66083,8 +65983,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "setzer-pre-cq": {
         "_template": "pre_cq",
@@ -66608,8 +66507,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "slippy-pre-cq": {
         "_template": "pre_cq",
@@ -67119,8 +67017,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "snappy-pre-cq": {
         "_template": "pre_cq",
@@ -67633,8 +67530,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "soraka-pre-cq": {
         "_template": "pre_cq",
@@ -68162,8 +68058,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "squawks-pre-cq": {
         "_template": "pre_cq",
@@ -68679,8 +68574,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "stout-pre-cq": {
         "_template": "pre_cq",
@@ -69199,8 +69093,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "sumo-pre-cq": {
         "_template": "pre_cq",
@@ -69713,8 +69606,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "swanky-pre-cq": {
         "_template": "pre_cq",
@@ -70959,8 +70851,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "terra-pre-cq": {
         "_template": "pre_cq",
@@ -71559,8 +71450,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "tidus-pre-cq": {
         "_template": "pre_cq",
@@ -72085,8 +71975,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "tricky-pre-cq": {
         "_template": "pre_cq",
@@ -72609,8 +72498,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "ultima-pre-cq": {
         "_template": "pre_cq",
@@ -73123,8 +73011,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "veyron_fievel-pre-cq": {
         "_template": "pre_cq",
@@ -73640,8 +73527,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "veyron_jaq-pre-cq": {
         "_template": "pre_cq",
@@ -74158,8 +74044,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "veyron_jerry-pre-cq": {
         "_template": "pre_cq",
@@ -74687,8 +74572,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "veyron_mickey-pre-cq": {
         "_template": "pre_cq",
@@ -75209,8 +75093,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "veyron_mighty-pre-cq": {
         "_template": "pre_cq",
@@ -75778,8 +75661,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "veyron_minnie-pre-cq": {
         "_template": "pre_cq",
@@ -76314,8 +76196,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "veyron_rialto-pre-cq": {
         "_template": "pre_cq",
@@ -76835,8 +76716,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "veyron_speedy-pre-cq": {
         "_template": "pre_cq",
@@ -77367,8 +77247,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "veyron_tiger-pre-cq": {
         "_template": "pre_cq",
@@ -77847,8 +77726,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "whirlwind-pre-cq": {
         "_template": "pre_cq",
@@ -78215,8 +78093,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "winky-pre-cq": {
         "_template": "pre_cq",
@@ -78752,8 +78629,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "wizpig-pre-cq": {
         "_template": "pre_cq",
@@ -79274,8 +79150,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "wolf-pre-cq": {
         "_template": "pre_cq",
@@ -80384,8 +80259,7 @@
         ],
         "debug": true,
         "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false
+        "luci_builder": "Try"
     },
     "zako-pre-cq": {
         "_template": "pre_cq",