MBI: [3/n] Add include-only MBI linux trybots

//tools/mb/mb_config_expectations/chromium.fyi.json was
updated by running "tools/mb/mb.py train"

//infra/config/generated/* was updated by running
"lucicfg generate infra/config/main.star"

R=hypan@google.com, martiniss@chromium.org

Bug: 1154360
Change-Id: I56374684d9877261613248d583cba53a83842ce2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2579867
Commit-Queue: Dominic Farolino <dom@chromium.org>
Reviewed-by: Haiyang Pan <hypan@google.com>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835914}

infra/config/generated/commit-queue.cfg

@@ -1060,6 +1060,14 @@ config_groups {
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
+      builders {
+        name: "chromium/try/linux-mbi-mode-per-render-process-host-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/linux-mbi-mode-per-site-instance-rel"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/linux-official"
         includable_only: true

infra/config/generated/cr-buildbucket.cfg

@@ -34228,6 +34228,116 @@ buckets {
         }
       }
     }
+    builders {
+      name: "linux-mbi-mode-per-render-process-host-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
+    builders {
+      name: "linux-mbi-mode-per-site-instance-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"recipe\":\"chromium_trybot\"}"
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
     builders {
       name: "linux-official"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -12054,6 +12054,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux-libfuzzer-asan-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-mbi-mode-per-render-process-host-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-mbi-mode-per-site-instance-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/linux-official"
   }
@@ -12932,6 +12938,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux-libfuzzer-asan-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-mbi-mode-per-render-process-host-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-mbi-mode-per-site-instance-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/linux-ozone-rel"
   }

infra/config/subprojects/chromium/try.star

@@ -982,6 +982,14 @@ try_.chromium_linux_builder(
     name = "linux-inverse-fieldtrials-fyi-rel",
 )
 
+try_.chromium_linux_builder(
+    name = "linux-mbi-mode-per-render-process-host-rel",
+)
+
+try_.chromium_linux_builder(
+    name = "linux-mbi-mode-per-site-instance-rel",
+)
+
 try_.chromium_linux_builder(
     name = "linux-lacros-fyi-rel",
 )

tools/mb/mb_config.pyl

@@ -965,6 +965,8 @@
       'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
       'linux-lacros-fyi-rel': 'lacros_on_linux_release_trybot',
       'linux-libfuzzer-asan-rel': 'libfuzzer_asan_release_trybot',
+      'linux-mbi-mode-per-render-process-host-rel': 'gpu_tests_release_trybot_mbi_mode_per_render_process_host',
+      'linux-mbi-mode-per-site-instance-rel': 'gpu_tests_release_trybot_mbi_mode_per_site_instance',
       'linux-ozone-rel': 'ozone_linux_release_trybot',
       'linux-perfetto-rel': 'perfetto_release_trybot',
       'linux-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
@@ -2035,6 +2037,14 @@
       'gpu_tests', 'release_trybot',
     ],
 
+    'gpu_tests_release_trybot_mbi_mode_per_render_process_host': [
+      'gpu_tests', 'release_trybot', 'mbi_mode_per_render_process_host'
+    ],
+
+    'gpu_tests_release_trybot_mbi_mode_per_site_instance': [
+      'gpu_tests', 'release_trybot', 'mbi_mode_per_site_instance'
+    ],
+
     # TODO(https://crbug.com/330262): Once deterministic builds are default on
     # macOS, remove this special case of gpu_tests_release_trybot.
     'gpu_tests_release_trybot_deterministic_mac': [
@@ -2964,6 +2974,14 @@
       'gn_args': 'ios_enable_multi_window=true'
     },
 
+    'mbi_mode_per_render_process_host': {
+      'gn_args': 'mbi_mode=\"per_render_process_host\"',
+    },
+
+    'mbi_mode_per_site_instance': {
+      'gn_args': 'mbi_mode=\"per_site_instance\"',
+    },
+
     'mojo_fuzzer': {
       'gn_args': 'enable_mojom_fuzzer=true',
     },

tools/mb/mb_config_expectations/tryserver.chromium.linux.json

@@ -489,6 +489,30 @@
       "use_libfuzzer": true
     }
   },
+  "linux-mbi-mode-per-render-process-host-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "mbi_mode": "per_render_process_host",
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "linux-mbi-mode-per-site-instance-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "mbi_mode": "per_site_instance",
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "linux-ozone-rel": {
     "gn_args": {
       "dcheck_always_on": true,