android: Add LUCI and mb configs for android-marshmallow-x86-rel

Bug: 997376
Change-Id: Icb0010398ec0c609bb9638d19df25b2ed6c341e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2255662
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: Yoshisato Yanagisawa <yyanagisawa@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781616}

infra/config/generated/commit-queue.cfg

@@ -166,6 +166,10 @@ config_groups {
         name: "chromium/try/android-marshmallow-x86-fyi-rel"
         includable_only: true
       }
+      builders {
+        name: "chromium/try/android-marshmallow-x86-rel"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/android-nougat-arm64-rel"
         includable_only: true

infra/config/generated/cr-buildbucket.cfg

@@ -9546,6 +9546,38 @@ buckets {
         }
       }
     }
+    builders {
+      name: "android-marshmallow-x86-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.ci"
+      dimensions: "ssd:0"
+      recipe {
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android\""
+      }
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
     builders {
       name: "android-mojo-webview-rel"
       swarming_host: "chromium-swarm.appspot.com"
@@ -20149,6 +20181,45 @@ buckets {
         }
       }
     }
+    builders {
+      name: "android-marshmallow-x86-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"
+      recipe {
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.android\""
+      }
+      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
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
     builders {
       name: "android-nougat-arm64-rel"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -335,6 +335,11 @@ consoles {
     category: "chromium.android|builder_tester|arm64"
     short_name: "N"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-rel"
+    category: "chromium.android|builder_tester|x86"
+    short_name: "M"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-lollipop-arm-rel"
     category: "chromium.android|on_cq"
@@ -2363,6 +2368,11 @@ consoles {
     category: "chromium.android|builder_tester|arm64"
     short_name: "N"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-rel"
+    category: "chromium.android|builder_tester|x86"
+    short_name: "M"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-lollipop-arm-rel"
     category: "chromium.android|on_cq"
@@ -4460,6 +4470,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-marshmallow-x86-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/android-nougat-arm64-rel"
   }
@@ -5693,6 +5706,11 @@ consoles {
     category: "builder_tester|arm64"
     short_name: "N"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-rel"
+    category: "builder_tester|x86"
+    short_name: "M"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-pie-x86-rel"
     category: "builder_tester|x86"
@@ -14793,6 +14811,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-marshmallow-x86-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/android-nougat-arm64-rel"
   }
@@ -15394,6 +15415,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-x86-fyi-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-marshmallow-x86-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/android-nougat-arm64-rel"
   }

infra/config/generated/luci-scheduler.cfg

@@ -4090,6 +4090,15 @@ job {
     builder: "android-marshmallow-x86-fyi-rel"
   }
 }
+job {
+  id: "android-marshmallow-x86-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-marshmallow-x86-rel"
+  }
+}
 job {
   id: "android-mojo-webview-rel"
   acl_sets: "ci"
@@ -7616,6 +7625,15 @@ job {
     builder: "android-marshmallow-x86-fyi-rel"
   }
 }
+job {
+  id: "ci-android-marshmallow-x86-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-marshmallow-x86-rel"
+  }
+}
 job {
   id: "ci-android-mojo-webview-rel"
   acl_sets: "ci"
@@ -11532,6 +11550,7 @@ trigger {
   triggers: "ci-android-lollipop-arm-rel"
   triggers: "ci-android-marshmallow-arm64-rel"
   triggers: "android-marshmallow-x86-fyi-rel"
+  triggers: "android-marshmallow-x86-rel"
   triggers: "android-mojo-webview-rel"
   triggers: "android-nougat-arm64-rel"
   triggers: "ci-android-pie-arm64-rel"

infra/config/subprojects/chromium/ci.star

@@ -423,6 +423,14 @@ ci.android_builder(
     ),
 )
 
+ci.android_builder(
+    name = 'android-marshmallow-x86-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'builder_tester|x86',
+        short_name = 'M',
+    ),
+)
+
 ci.android_builder(
     name = 'android-nougat-arm64-rel',
     console_view_entry = ci.console_view_entry(

infra/config/subprojects/chromium/master-only/consoles/luci.chromium.try.star

@@ -8,6 +8,7 @@ luci.list_view(
         'try/android-cronet-arm-dbg',
         'try/android-lollipop-arm-rel',
         'try/android-marshmallow-arm64-rel',
+        'try/android-marshmallow-x86-rel',
         'try/android-nougat-arm64-rel',
         'try/android-oreo-arm64-cts-networkservice-dbg',
         'try/android-pie-arm64-coverage-rel',

infra/config/subprojects/chromium/try.star

@@ -102,6 +102,11 @@ try_.chromium_android_builder(
     tryjob = try_.job(),
 )
 
+try_.chromium_android_builder(
+    name = 'android-marshmallow-x86-rel',
+    goma_jobs = goma.jobs.J150,
+)
+
 try_.chromium_android_builder(
     name = 'android-nougat-arm64-rel',
     goma_jobs = goma.jobs.J150,

tools/mb/mb_config.pyl

@@ -92,6 +92,7 @@
       # on the chromium.gpu waterfall, which it mirrors via trybots.pyl.
       'android-marshmallow-arm64-rel': 'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild',
 
+      'android-marshmallow-x86-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_resource_whitelisting_webview_google',
       'android-nougat-arm64-rel': 'android_release_bot_minimal_symbols_arm64_fastbuild_webview_google',
       'android-pie-arm64-rel': 'android_release_bot_minimal_symbols_arm64_webview_google',
       'android-pie-x86-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
@@ -696,6 +697,7 @@
       'android-lollipop-arm-rel': 'android_release_trybot_fastbuild_webview_google',
       'android-marshmallow-arm64-rel': 'gpu_tests_android_release_trybot_arm64_resource_whitelisting_fastbuild_java_coverage',
       'android-marshmallow-x86-fyi-rel': 'android_release_trybot_x86_fastbuild_resource_whitelisting_webview_google',
+      'android-marshmallow-x86-rel': 'android_release_trybot_x86_fastbuild_resource_whitelisting_webview_google',
       'android-nougat-arm64-rel': 'android_release_trybot_arm64_fastbuild_webview_google',
       'android-oreo-arm64-cts-networkservice-dbg': 'android_debug_trybot_arm64',
       'android-pie-arm64-coverage-rel': 'android_release_trybot_arm64_webview_google_native_coverage',