Add compile+luci+test configs for android-marshmallow-x86-fyi-rel

The goma settings are removed from the configs.
They could be added back if the compile is too slow.

In mb_config, compared to android-marshmallow-arm64-rel:
  * gpu_tests is removed since we don't want it running on emulator.
  * resource_whitelisting is kept as noted in crrev.com/c/1600421


Related CLs: crrev.com/c/1785743, crrev.com/c/1769798

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

infra/config/cr-buildbucket.cfg

@@ -1322,6 +1322,13 @@ buckets {
       mixins: "linux-xenial"
     }
 
+    builders {
+      name: "android-marshmallow-x86-fyi-rel"
+      mixins: "android-fyi-ci"
+      mixins: "builderless"
+      mixins: "linux-xenial"
+    }
+
     builders {
       name: "android-mojo-webview-rel"
       mixins: "fyi-ci"
@@ -4030,6 +4037,12 @@ buckets {
       dimensions: "cores:16"
       dimensions: "ssd:1"
     }
+    builders {
+      name: "android-marshmallow-x86-fyi-rel"
+      mixins: "android-try"
+      mixins: "builderless"
+      mixins: "linux-xenial"
+    }
     builders {
       mixins: "android-try"
       name: "android-oreo-arm64-cts-networkservice-dbg"

infra/config/luci-milo.cfg

@@ -1639,9 +1639,14 @@ consoles {
     category: "webview"
     short_name: "ns"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-fyi-rel"
+    category: "emulator|M|x86"
+    short_name: "rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-pie-x86-fyi-rel"
-    category: "emulator|pie|x86"
+    category: "emulator|P|x86"
     short_name: "rel"
   }
 }
@@ -4313,6 +4318,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-marshmallow-x86-fyi-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/android-oreo-arm64-rel"
   }
@@ -4968,6 +4976,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-marshmallow-x64-fyi-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/android-oreo-arm64-cts-networkservice-dbg"
   }

infra/config/luci-scheduler.cfg

@@ -880,6 +880,19 @@ job {
   }
 }
 
+job {
+  id: "android-marshmallow-x86-fyi-rel"
+  acl_sets: "default"
+  # Only run nightly while we work out test issues and
+  # productionize emulator infra. crbug.com/961025
+  schedule: "0 7 * * *"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-marshmallow-x86-fyi-rel"
+  }
+}
+
 job {
   id: "android-mojo-webview-rel"
   acl_sets: "default"

testing/buildbot/mixins.pyl

@@ -472,6 +472,37 @@
       },
     },
   },
+  'marshmallow-x86-emulator': {
+    '$mixin_append': {
+      'args': [
+        '--avd-name=20190903T160000Z_android_23_google_apis_x86',
+        '--emulator-home=../../.android',
+      ],
+    },
+    'swarming': {
+      'cipd_packages': [
+        {
+          'cipd_package': 'chromium/third_party/android_sdk/public/avds/android-23/google_apis/x86',
+          'location': '.android',
+          'revision': 'cfoclSzHrFOS_AcwBL09RQ5PvJByQHu3MX6EbC5aWZIC',
+        },
+        {
+          'cipd_package': 'chromium/third_party/android_sdk/public/emulator',
+          'location': 'third_party/android_sdk/public',
+          'revision': 'f4WdgkPvDdVCE8zBWPzcSIj4N9WFhKp3CSKDWylXuLEC',
+        },
+        {
+          'cipd_package': 'chromium/third_party/android_sdk/public/system-images/android-23/google_apis/x86',
+          'location': 'third_party/android_sdk/public',
+          'revision': 'npuCAATVbhmywZwGhI3tMoECTrBBzzyJLpjAPXqtmYYC',
+        },
+      ],
+      'dimensions': {
+        'device_os': None,
+        'device_type': None,
+      },
+    },
+  },
   'marshmallow_generic': {
     'swarming': {
       'dimensions': {

testing/buildbot/test_suite_exceptions.pyl

@@ -334,6 +334,7 @@
       'Lollipop Tablet Tester',
       'Marshmallow Tablet Tester',
       # chromium.android.fyi
+      'android-marshmallow-x86-fyi-rel',
       'android-pie-x86-fyi-rel',
       # chromium.clang
       'ToTAndroid',
@@ -1630,18 +1631,21 @@
   'vr_android_unittests': {
     'remove_from': [
       # chromium.android.fyi
+      'android-marshmallow-x86-fyi-rel',
       'android-pie-x86-fyi-rel',
     ],
   },
   'vr_common_unittests': {
     'remove_from': [
       # chromium.android.fyi
+      'android-marshmallow-x86-fyi-rel',
       'android-pie-x86-fyi-rel',
     ],
   },
   'vr_pixeltests': {
     'remove_from': [
       # chromium.android.fyi
+      'android-marshmallow-x86-fyi-rel',
       'android-pie-x86-fyi-rel',
       # chromium.fyi
       'VR Linux',

testing/buildbot/waterfalls.pyl

@@ -671,6 +671,21 @@
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         }
       },
+      'android-marshmallow-x86-fyi-rel': {
+        'mixins': [
+          'marshmallow-x86-emulator',
+          'linux-xenial',
+          'x86-64',
+        ],
+        'os_type': 'android',
+        'additional_compile_targets': [
+          'monochrome_static_initializers',
+        ],
+        'test_suites': {
+          'gtest_tests': 'chromium_android_gtests',
+          'isolated_scripts': 'marshmallow_isolated_scripts',
+        }
+      },
       'android-pie-x86-fyi-rel': {
         'mixins': [
           'pie-x86-emulator',

tools/mb/mb_config.pyl

@@ -76,6 +76,7 @@
 
     'chromium.android.fyi': {
       'Memory Infra Tester': 'android_release_thumb_bot',
+      'android-marshmallow-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_resource_whitelisting',
       'android-pie-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86',
       'android-bfcache-rel': 'android_release_bot_minimal_symbols',
     },
@@ -644,6 +645,7 @@
       'android-kitkat-arm-coverage-rel': 'android_release_trybot_java_coverage',
       'android-kitkat-arm-rel': 'android_release_trybot',
       'android-marshmallow-arm64-rel': 'gpu_tests_android_release_trybot_arm64_resource_whitelisting',
+      'android-marshmallow-x86-fyi-rel': 'android_release_trybot_x86_resource_whitelisting',
       'android-oreo-arm64-cts-networkservice-dbg': 'android_debug_trybot_arm64',
       'android-oreo-arm64-rel': 'android_release_trybot_arm64_webview_google',
       'android-pie-x86-fyi-rel': 'android_release_trybot_x86',
@@ -1101,6 +1103,11 @@
       'strip_debug_info',
     ],
 
+    'android_release_bot_minimal_symbols_x86_resource_whitelisting': [
+      'android', 'release_bot', 'minimal_symbols', 'x86',
+      'strip_debug_info', 'resource_whitelisting',
+    ],
+
     'android_release_thumb_bot': [
       'android', 'release_bot', 'arm_thumb',
     ],
@@ -1126,6 +1133,11 @@
       'android', 'release_trybot', 'strip_debug_info', 'x86',
     ],
 
+    'android_release_trybot_x86_resource_whitelisting': [
+      'android', 'release_trybot', 'strip_debug_info', 'x86',
+      'resource_whitelisting',
+    ],
+
     'android_webview_google_debug_static_bot': [
       'android', 'debug_static_bot', 'webview_google',
     ],