chromeos.continuous builders > chrome

Bug: chromium:1127088
Change-Id: Ib4eb900e82eb701eaf12367045a5848163720501
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545749Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Jacob Kopczynski <jkop@chromium.org>
Auto-Submit: Jacob Kopczynski <jkop@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828791}

tools/mb/mb_config.pyl

@@ -14,11 +14,27 @@
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     'chrome': {
+      'chromeos-arm-generic-beta': 'official_chromeos_arm-generic',
+      'chromeos-arm-generic-ltc': 'official_chromeos_arm-generic',
+      'chromeos-arm-generic-lts': 'official_chromeos_arm-generic',
+      'chromeos-arm-generic-stable': 'official_chromeos_arm-generic',
       'chromeos-arm-generic-cfi-thin-lto-chrome': 'chromeos_arm-generic_cfi_thin_lto_official',
       'chromeos-betty-pi-arc-cfi-thin-lto-chrome': 'chromeos_betty-pi-arc_cfi_thin_lto_official',
       'chromeos-betty-pi-arc-chrome': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
+      'chromeos-betty-pi-arc-chrome-beta': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
+      'chromeos-betty-pi-arc-chrome-ltc': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
+      'chromeos-betty-pi-arc-chrome-lts': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
+      'chromeos-betty-pi-arc-chrome-stable': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
       'chromeos-eve-chrome': 'chromeos_eve_include_unwind_tables_official',
+      'chromeos-eve-chrome-beta': 'chromeos_eve_include_unwind_tables_official',
+      'chromeos-eve-chrome-ltc': 'chromeos_eve_include_unwind_tables_official',
+      'chromeos-eve-chrome-lts': 'chromeos_eve_include_unwind_tables_official',
+      'chromeos-eve-chrome-stable': 'chromeos_eve_include_unwind_tables_official',
       'chromeos-kevin-chrome': 'chromeos_kevin_include_unwind_tables_official',
+      'chromeos-kevin-chrome-beta': 'chromeos_kevin_include_unwind_tables_official',
+      'chromeos-kevin-chrome-ltc': 'chromeos_kevin_include_unwind_tables_official',
+      'chromeos-kevin-chrome-lts': 'chromeos_kevin_include_unwind_tables_official',
+      'chromeos-kevin-chrome-stable': 'chromeos_kevin_include_unwind_tables_official',
       'lacros-chrome': 'chromeos_amd64-generic_lacros_official',
       # Don't include unwind tables for the remaining three builders since
       # they monitor binary size growth, which may be affected by the tables.
@@ -27,6 +43,10 @@
       'linux-chrome-beta': 'official_goma',
       'linux-chrome-stable': 'official_goma',
       'linux-chromeos-chrome': 'official_goma_chromeos_include_unwind_tables',
+      'linux-chromeos-beta': 'official_goma_chromeos',
+      'linux-chromeos-ltc': 'official_goma_chromeos',
+      'linux-chromeos-lts': 'official_goma_chromeos',
+      'linux-chromeos-stable': 'official_goma_chromeos',
       'mac-chrome': 'official_goma_mac',
       'mac-chrome-beta': 'official_goma_mac',
       'mac-chrome-stable': 'official_goma_mac',
@@ -51,32 +71,6 @@
       'win64-pgo-stable': 'official_goma_x64_pgo',
       'win64-pgo-trunk': 'official_goma_x64_pgo',
     },
-    'chromeos.continuous': {
-      'chromeos-arm-generic-beta': 'official_chromeos_arm-generic',
-      'chromeos-arm-generic-ltc': 'official_chromeos_arm-generic',
-      'chromeos-arm-generic-lts': 'official_chromeos_arm-generic',
-      'chromeos-arm-generic-stable': 'official_chromeos_arm-generic',
-      'chromeos-betty-pi-arc-chrome-beta': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
-      'chromeos-betty-pi-arc-chrome-ltc': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
-      'chromeos-betty-pi-arc-chrome-lts': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
-      'chromeos-betty-pi-arc-chrome-stable': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
-      'chromeos-eve-chrome-beta': 'chromeos_eve_include_unwind_tables_official',
-      'chromeos-eve-chrome-ltc': 'chromeos_eve_include_unwind_tables_official',
-      'chromeos-eve-chrome-lts': 'chromeos_eve_include_unwind_tables_official',
-      'chromeos-eve-chrome-stable': 'chromeos_eve_include_unwind_tables_official',
-      'chromeos-kevin-chrome-beta': 'chromeos_kevin_include_unwind_tables_official',
-      'chromeos-kevin-chrome-ltc': 'chromeos_kevin_include_unwind_tables_official',
-      'chromeos-kevin-chrome-lts': 'chromeos_kevin_include_unwind_tables_official',
-      'chromeos-kevin-chrome-stable': 'chromeos_kevin_include_unwind_tables_official',
-      'linux64-beta': 'official_goma',
-      'linux64-ltc': 'official_goma',
-      'linux64-lts': 'official_goma',
-      'linux64-stable': 'official_goma',
-      'linux-chromeos-beta': 'official_goma_chromeos',
-      'linux-chromeos-ltc': 'official_goma_chromeos',
-      'linux-chromeos-lts': 'official_goma_chromeos',
-      'linux-chromeos-stable': 'official_goma_chromeos',
-    },
     # Take care when changing any of these builders to ensure that you do not
     # include a configuration with 'chrome_with_codecs' since these builders
     # generate publicly advertised non-Official builds which are not allowed

tools/mb/mb_config_expectations/chrome.json

 {
+  "chromeos-arm-generic-beta": {
+    "args_file": "//build/args/chromeos/arm-generic.gni",
+    "gn_args": {
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
   "chromeos-arm-generic-cfi-thin-lto-chrome": {
     "args_file": "//build/args/chromeos/arm-generic.gni",
     "gn_args": {
@@ -13,6 +22,33 @@
       "use_thin_lto": true
     }
   },
+  "chromeos-arm-generic-ltc": {
+    "args_file": "//build/args/chromeos/arm-generic.gni",
+    "gn_args": {
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
+  "chromeos-arm-generic-lts": {
+    "args_file": "//build/args/chromeos/arm-generic.gni",
+    "gn_args": {
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
+  "chromeos-arm-generic-stable": {
+    "args_file": "//build/args/chromeos/arm-generic.gni",
+    "gn_args": {
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
   "chromeos-betty-pi-arc-cfi-thin-lto-chrome": {
     "args_file": "//build/args/chromeos/betty-pi-arc.gni",
     "gn_args": {
@@ -39,6 +75,54 @@
       "use_real_dbus_clients": false
     }
   },
+  "chromeos-betty-pi-arc-chrome-beta": {
+    "args_file": "//build/args/chromeos/betty-pi-arc.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true,
+      "use_real_dbus_clients": false
+    }
+  },
+  "chromeos-betty-pi-arc-chrome-ltc": {
+    "args_file": "//build/args/chromeos/betty-pi-arc.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true,
+      "use_real_dbus_clients": false
+    }
+  },
+  "chromeos-betty-pi-arc-chrome-lts": {
+    "args_file": "//build/args/chromeos/betty-pi-arc.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true,
+      "use_real_dbus_clients": false
+    }
+  },
+  "chromeos-betty-pi-arc-chrome-stable": {
+    "args_file": "//build/args/chromeos/betty-pi-arc.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true,
+      "use_real_dbus_clients": false
+    }
+  },
   "chromeos-eve-chrome": {
     "args_file": "//build/args/chromeos/eve.gni",
     "gn_args": {
@@ -50,6 +134,50 @@
       "use_goma": true
     }
   },
+  "chromeos-eve-chrome-beta": {
+    "args_file": "//build/args/chromeos/eve.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
+  "chromeos-eve-chrome-ltc": {
+    "args_file": "//build/args/chromeos/eve.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
+  "chromeos-eve-chrome-lts": {
+    "args_file": "//build/args/chromeos/eve.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
+  "chromeos-eve-chrome-stable": {
+    "args_file": "//build/args/chromeos/eve.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
   "chromeos-kevin-chrome": {
     "args_file": "//build/args/chromeos/kevin.gni",
     "gn_args": {
@@ -61,6 +189,50 @@
       "use_goma": true
     }
   },
+  "chromeos-kevin-chrome-beta": {
+    "args_file": "//build/args/chromeos/kevin.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
+  "chromeos-kevin-chrome-ltc": {
+    "args_file": "//build/args/chromeos/kevin.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
+  "chromeos-kevin-chrome-lts": {
+    "args_file": "//build/args/chromeos/kevin.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
+  "chromeos-kevin-chrome-stable": {
+    "args_file": "//build/args/chromeos/kevin.gni",
+    "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true
+    }
+  },
   "lacros-chrome": {
     "args_file": "//build/args/chromeos/amd64-generic.gni",
     "gn_args": {
@@ -112,6 +284,15 @@
       "use_goma": true
     }
   },
+  "linux-chromeos-beta": {
+    "gn_args": {
+      "is_chrome_branded": true,
+      "is_official_build": true,
+      "symbol_level": 1,
+      "target_os": "chromeos",
+      "use_goma": true
+    }
+  },
   "linux-chromeos-chrome": {
     "gn_args": {
       "exclude_unwind_tables": false,
@@ -121,6 +302,33 @@
       "use_goma": true
     }
   },
+  "linux-chromeos-ltc": {
+    "gn_args": {
+      "is_chrome_branded": true,
+      "is_official_build": true,
+      "symbol_level": 1,
+      "target_os": "chromeos",
+      "use_goma": true
+    }
+  },
+  "linux-chromeos-lts": {
+    "gn_args": {
+      "is_chrome_branded": true,
+      "is_official_build": true,
+      "symbol_level": 1,
+      "target_os": "chromeos",
+      "use_goma": true
+    }
+  },
+  "linux-chromeos-stable": {
+    "gn_args": {
+      "is_chrome_branded": true,
+      "is_official_build": true,
+      "symbol_level": 1,
+      "target_os": "chromeos",
+      "use_goma": true
+    }
+  },
   "linux64-trunk": {
     "gn_args": {
       "is_chrome_branded": true,

tools/mb/mb_config_expectations/chromeos.continuous.json

-{
-  "chromeos-arm-generic-beta": {
-    "args_file": "//build/args/chromeos/arm-generic.gni",
-    "gn_args": {
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-arm-generic-ltc": {
-    "args_file": "//build/args/chromeos/arm-generic.gni",
-    "gn_args": {
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-arm-generic-lts": {
-    "args_file": "//build/args/chromeos/arm-generic.gni",
-    "gn_args": {
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-arm-generic-stable": {
-    "args_file": "//build/args/chromeos/arm-generic.gni",
-    "gn_args": {
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-betty-pi-arc-chrome-beta": {
-    "args_file": "//build/args/chromeos/betty-pi-arc.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true,
-      "use_real_dbus_clients": false
-    }
-  },
-  "chromeos-betty-pi-arc-chrome-ltc": {
-    "args_file": "//build/args/chromeos/betty-pi-arc.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true,
-      "use_real_dbus_clients": false
-    }
-  },
-  "chromeos-betty-pi-arc-chrome-lts": {
-    "args_file": "//build/args/chromeos/betty-pi-arc.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true,
-      "use_real_dbus_clients": false
-    }
-  },
-  "chromeos-betty-pi-arc-chrome-stable": {
-    "args_file": "//build/args/chromeos/betty-pi-arc.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true,
-      "use_real_dbus_clients": false
-    }
-  },
-  "chromeos-eve-chrome-beta": {
-    "args_file": "//build/args/chromeos/eve.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-eve-chrome-ltc": {
-    "args_file": "//build/args/chromeos/eve.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-eve-chrome-lts": {
-    "args_file": "//build/args/chromeos/eve.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-eve-chrome-stable": {
-    "args_file": "//build/args/chromeos/eve.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-kevin-chrome-beta": {
-    "args_file": "//build/args/chromeos/kevin.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-kevin-chrome-ltc": {
-    "args_file": "//build/args/chromeos/kevin.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-kevin-chrome-lts": {
-    "args_file": "//build/args/chromeos/kevin.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-kevin-chrome-stable": {
-    "args_file": "//build/args/chromeos/kevin.gni",
-    "gn_args": {
-      "exclude_unwind_tables": false,
-      "is_chrome_branded": true,
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "linux-chromeos-beta": {
-    "gn_args": {
-      "is_chrome_branded": true,
-      "is_official_build": true,
-      "symbol_level": 1,
-      "target_os": "chromeos",
-      "use_goma": true
-    }
-  },
-  "linux-chromeos-ltc": {
-    "gn_args": {
-      "is_chrome_branded": true,
-      "is_official_build": true,
-      "symbol_level": 1,
-      "target_os": "chromeos",
-      "use_goma": true
-    }
-  },
-  "linux-chromeos-lts": {
-    "gn_args": {
-      "is_chrome_branded": true,
-      "is_official_build": true,
-      "symbol_level": 1,
-      "target_os": "chromeos",
-      "use_goma": true
-    }
-  },
-  "linux-chromeos-stable": {
-    "gn_args": {
-      "is_chrome_branded": true,
-      "is_official_build": true,
-      "symbol_level": 1,
-      "target_os": "chromeos",
-      "use_goma": true
-    }
-  },
-  "linux64-beta": {
-    "gn_args": {
-      "is_chrome_branded": true,
-      "is_official_build": true,
-      "use_goma": true
-    }
-  },
-  "linux64-ltc": {
-    "gn_args": {
-      "is_chrome_branded": true,
-      "is_official_build": true,
-      "use_goma": true
-    }
-  },
-  "linux64-lts": {
-    "gn_args": {
-      "is_chrome_branded": true,
-      "is_official_build": true,
-      "use_goma": true
-    }
-  },
-  "linux64-stable": {
-    "gn_args": {
-      "is_chrome_branded": true,
-      "is_official_build": true,
-      "use_goma": true
-    }
-  }
-}
\ No newline at end of file