Add tricky builder back

We need Tricky builds on R36, so lets add the builder back.

BUG=chromium:381512
TEST=None

Change-Id: Ic1e915f8f9a4bf5594a4138931a9caea4b6433ca
Reviewed-on: https://chromium-review.googlesource.com/202833
Reviewed-by: Ben Henry <benhenry@chromium.org>
Commit-Queue: Bernie Thompson <bhthompson@chromium.org>
Tested-by: Bernie Thompson <bhthompson@chromium.org>
Reviewed-by: Peter Mayo <petermayo@chromium.org>
diff --git a/buildbot/cbuildbot_config.py b/buildbot/cbuildbot_config.py
index 75b9b79..6e7f31b 100755
--- a/buildbot/cbuildbot_config.py
+++ b/buildbot/cbuildbot_config.py
@@ -2195,6 +2195,7 @@
 # building it.
 _AddGroupConfig('beltino', 'panther', (
     'monroe',
+    'tricky',
     'zako',
 ))
 
diff --git a/buildbot/config_dump.json b/buildbot/config_dump.json
index 21c784b..e7b7a55 100644
--- a/buildbot/config_dump.json
+++ b/buildbot/config_dump.json
@@ -3522,6 +3522,101 @@
                 "binhost_key": null,
                 "board_replace": false,
                 "boards": [
+                    "tricky"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "full",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": false,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Full Builds",
+                "dev_installer_prebuilts": false,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "disk_vm_layout": "2gb-rootfs-updatable",
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": true,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [],
+                "hwqual": false,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": false,
+                "latest_toolchain": false,
+                "manifest": "default.xml",
+                "manifest_repo_url": "https://chromium.googlesource.com/chromiumos/manifest",
+                "manifest_version": false,
+                "master": false,
+                "name": "tricky-full",
+                "overlays": "public",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": false,
+                "perform_paygen_testing": true,
+                "pgo_generate": false,
+                "pgo_use": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": "public",
+                "profile": null,
+                "push_image": false,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_results": false,
+                "signer_tests": false,
+                "sync_chrome": null,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": false,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [],
+                "usepkg_build_packages": false,
+                "usepkg_setup_board": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "archive": true,
+                "archive_build_debug": true,
+                "arm": false,
+                "binhost_base_url": null,
+                "binhost_bucket": null,
+                "binhost_key": null,
+                "board_replace": false,
+                "boards": [
                     "zako"
                 ],
                 "branch": false,
@@ -3621,7 +3716,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Full Builds; Group config (boards: panther, monroe, zako)",
+        "description": "Full Builds; Group config (boards: panther, monroe, tricky, zako)",
         "dev_installer_prebuilts": false,
         "dev_manifest": "default.xml",
         "disk_layout": null,
@@ -4216,6 +4311,110 @@
                 "binhost_key": "RELEASE_BINHOST",
                 "board_replace": false,
                 "boards": [
+                    "tricky"
+                ],
+                "branch": false,
+                "build_before_patching": false,
+                "build_packages_in_background": true,
+                "build_tests": true,
+                "build_type": "canary",
+                "child_configs": [],
+                "chrome_binhost_only": false,
+                "chrome_rev": null,
+                "chrome_sdk": true,
+                "chrome_sdk_build_chrome": false,
+                "chrome_sdk_goma": false,
+                "chromeos_official": true,
+                "chroot_replace": true,
+                "compilecheck": false,
+                "cpe_export": true,
+                "create_delta_sysroot": false,
+                "critical_for_chrome": false,
+                "debug_symbols": true,
+                "description": "Release Builds (canary) (internal)",
+                "dev_installer_prebuilts": true,
+                "dev_manifest": "default.xml",
+                "disk_layout": null,
+                "disk_vm_layout": "usb",
+                "do_not_apply_cq_patches": false,
+                "factory_install_netboot": true,
+                "factory_toolkit": true,
+                "gcc_githash": null,
+                "git_sync": false,
+                "grouped": true,
+                "gs_path": "default",
+                "health_alert_recipients": [],
+                "health_threshold": 0,
+                "hw_tests": [
+                    "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": true,\n    \"num\": 6,\n    \"pool\": \"bvt\",\n    \"priority\": \"DEFAULT\",\n    \"suite\": \"bvt\",\n    \"timeout\": 36000\n}",
+                    "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": true,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"DEFAULT\",\n    \"suite\": \"au\",\n    \"timeout\": 36000\n}",
+                    "{\n    \"async\": false,\n    \"critical\": false,\n    \"fatal_timeouts\": true,\n    \"file_bugs\": true,\n    \"num\": 2,\n    \"pool\": \"bvt\",\n    \"priority\": \"DEFAULT\",\n    \"suite\": \"qav\",\n    \"timeout\": 36000\n}"
+                ],
+                "hwqual": true,
+                "images": [
+                    "base",
+                    "test",
+                    "factory_install"
+                ],
+                "important": false,
+                "internal": true,
+                "latest_toolchain": false,
+                "manifest": "official.xml",
+                "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+                "manifest_version": true,
+                "master": false,
+                "name": "tricky-release",
+                "overlays": "both",
+                "packages": [],
+                "paladin_builder_name": null,
+                "paygen": true,
+                "perform_paygen_testing": true,
+                "pgo_generate": false,
+                "pgo_use": false,
+                "postsync_patch": true,
+                "postsync_reexec": true,
+                "pre_cq": false,
+                "prebuilts": false,
+                "profile": null,
+                "push_image": true,
+                "push_overlays": null,
+                "quick_unit": false,
+                "rootfs_verification": true,
+                "sanity_check_slaves": null,
+                "shared_user_password": null,
+                "signer_results": true,
+                "signer_tests": true,
+                "sync_chrome": null,
+                "trybot_list": true,
+                "unittest_blacklist": [],
+                "unittests": null,
+                "upload_hw_test_artifacts": true,
+                "upload_standalone_images": true,
+                "upload_symbols": true,
+                "uprev": true,
+                "use_chrome_lkgm": false,
+                "use_lkgm": false,
+                "use_sdk": true,
+                "useflags": [
+                    "chrome_internal",
+                    "chrome_pdf",
+                    "-cros-debug",
+                    "-highdpi"
+                ],
+                "usepkg_build_packages": false,
+                "usepkg_setup_board": false,
+                "vm_test_runs": 1,
+                "vm_tests": []
+            },
+            {
+                "archive": true,
+                "archive_build_debug": true,
+                "arm": false,
+                "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
+                "binhost_bucket": "gs://chromeos-dev-installer",
+                "binhost_key": "RELEASE_BINHOST",
+                "board_replace": false,
+                "boards": [
                     "zako"
                 ],
                 "branch": false,
@@ -4324,7 +4523,7 @@
         "create_delta_sysroot": false,
         "critical_for_chrome": false,
         "debug_symbols": true,
-        "description": "Release Builds (canary) (internal); Group config (boards: panther, monroe, zako)",
+        "description": "Release Builds (canary) (internal); Group config (boards: panther, monroe, tricky, zako)",
         "dev_installer_prebuilts": true,
         "dev_manifest": "default.xml",
         "disk_layout": null,