Refactor chromium.perf recipe configs.

scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_x64_FYI_Builder.json

Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_x64_FYI_Builder.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_x64_FYI_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_x64_FYI_Builder.json
index b789cb0a3cdd05df9c536121d5ace845698d1295..b8dcba00f885660ae67f2b45e7b6ae6495544f22 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_x64_FYI_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_x64_FYI_Builder.json
@@ -113,6 +113,60 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "ensure_goma"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[build::cipd]\\resources\\bootstrap.py",
+      "--platform",
+      "windows-amd64",
+      "--dest-directory",
+      "[SLAVE_BUILD]\\cipd",
+      "--json-output",
+      "/path/to/tmp/json"
+    ],
+    "name": "ensure_goma.install cipd",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[SLAVE_BUILD]\\cipd\\cipd",
+      "ensure",
+      "--root",
+      "[CACHE]\\cipd\\goma",
+      "--list",
+      "infra_internal/goma/client/windows-amd64 release",
+      "--json-output",
+      "/path/to/tmp/json",
+      "--service-account-json",
+      "C:\\creds\\service_accounts\\service-account-goma-client.json"
+    ],
+    "name": "ensure_goma.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  ]@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
     "cmd": [
       "python",
       "-u",
@@ -122,7 +176,8 @@
     "cwd": "[SLAVE_BUILD]\\src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
-      "GYP_DEFINES": "branding=Chrome buildtype=Official chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[BUILD]\\goma' target_arch=x64 use_goma=0",
+      "GYP_CHROMIUM_NO_ACTION": "1",
+      "GYP_DEFINES": "branding=Chrome buildtype=Official chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
@@ -142,6 +197,27 @@
     "cmd": [
       "python",
       "-u",
+      "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
+      "gen",
+      "-m",
+      "chromium.perf.fyi",
+      "-b",
+      "Win x64 FYI Builder",
+      "--config-file",
+      "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl",
+      "--goma-dir",
+      "[CACHE]\\cipd\\goma",
+      "//out/Release_x64"
+    ],
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
+    },
+    "name": "generate_build_files"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
       "--show-path",
       "python",
@@ -160,15 +236,27 @@
       "ninja",
       "--build-data-dir",
       "[ROOT]\\build_data_dir",
+      "--compiler",
+      "goma",
+      "--goma-jsonstatus",
+      "/path/to/tmp/json",
+      "--goma-service-account-json-file",
+      "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "--mode",
       "official",
+      "--goma-dir",
+      "[CACHE]\\cipd\\goma",
       "--",
       "chromium_builder_perf"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
-    "name": "compile"
+    "name": "compile",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+      "@@@STEP_LOG_END@json.output (invalid)@@@"
+    ]
   },
   {
     "allow_subannotations": true,