OOR-CORS: Setup "WebView P OOR-CORS FYI (rel)" bot

This patch adds the "WebView P OOR-CORS FYI (rel)" bot to
run WebView instrumentation tests, unittests, and CTS tests
with OOR-CORS enabled.

Preceding tools/build side change is here:
https://chromium-review.googlesource.com/c/chromium/tools/build/+/1863899

Bug: 1013529
Change-Id: Ia35a9928138be322e9b6cab3531807957da0ffa7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864502
Commit-Queue: Takashi Toyoshima <toyoshim@chromium.org>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706382}

infra/config/buckets/ci.star

@@ -376,6 +376,10 @@ android_fyi_builder(
     goma_backend = goma.backend.RBE_PROD,
 )
 
+android_fyi_builder(
+    name = 'Android WebView P OOR-CORS FYI (rel)',
+)
+
 android_fyi_builder(
     name = 'android-marshmallow-x86-fyi-rel',
 )

infra/config/generated/cr-buildbucket.cfg

@@ -668,6 +668,26 @@ buckets: <
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "Android WebView P OOR-CORS FYI (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: "ssd:0"
+      recipe: <
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.android.fyi\""
+      >
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+    >
     builders: <
       name: "Android arm Builder (dbg)"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -1553,6 +1553,11 @@ consoles {
     category: "webview"
     short_name: "p-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView P OOR-CORS FYI (rel)"
+    category: "webview"
+    short_name: "cors"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-fyi-rel"
     category: "emulator|M|x86"

infra/config/generated/luci-scheduler.cfg

@@ -70,6 +70,7 @@ trigger {
   triggers: "Afl Upload Linux ASan"
   triggers: "Android ASAN (dbg)"
   triggers: "Android WebView P FYI (rel)"
+  triggers: "Android WebView P OOR-CORS FYI (rel)"
   triggers: "android-archive-dbg-goma-canary"
   triggers: "android-archive-dbg-goma-latest"
   triggers: "android-archive-dbg-goma-rbe-canary"
@@ -703,6 +704,16 @@ job {
   }
 }
 
+job {
+  id: "Android WebView P OOR-CORS FYI (rel)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView P OOR-CORS FYI (rel)"
+  }
+}
+
 job {
   id: "Android x64 Builder (dbg)"
   acl_sets: "default"

infra/config/luci-milo.cfg

@@ -1553,6 +1553,11 @@ consoles {
     category: "webview"
     short_name: "p-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android WebView P OOR-CORS FYI (rel)"
+    category: "webview"
+    short_name: "cors"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-fyi-rel"
     category: "emulator|M|x86"

infra/config/luci-scheduler.cfg

@@ -70,6 +70,7 @@ trigger {
   triggers: "Afl Upload Linux ASan"
   triggers: "Android ASAN (dbg)"
   triggers: "Android WebView P FYI (rel)"
+  triggers: "Android WebView P OOR-CORS FYI (rel)"
   triggers: "android-archive-dbg-goma-canary"
   triggers: "android-archive-dbg-goma-latest"
   triggers: "android-archive-dbg-goma-rbe-canary"
@@ -703,6 +704,16 @@ job {
   }
 }
 
+job {
+  id: "Android WebView P OOR-CORS FYI (rel)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView P OOR-CORS FYI (rel)"
+  }
+}
+
 job {
   id: "Android x64 Builder (dbg)"
   acl_sets: "default"

testing/buildbot/chromium.android.fyi.json

@@ -65,6 +65,252 @@
       }
     ]
   },
+  "Android WebView P OOR-CORS FYI (rel)": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--enable-features=OutOfBlinkCors",
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "android_webview_unittests_oor_cors"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "name": "android_webview_unittests_oor_cors",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "PQ3A.190801.002",
+              "device_os_flavor": "google",
+              "device_os_type": "userdebug",
+              "device_type": "walleye",
+              "os": "Android"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "android_webview_unittests"
+      },
+      {
+        "args": [
+          "--enable-features=OutOfBlinkCors",
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "system_webview_shell_layout_test_apk_oor_cors"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "name": "system_webview_shell_layout_test_apk_oor_cors",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "PQ3A.190801.002",
+              "device_os_flavor": "google",
+              "device_os_type": "userdebug",
+              "device_type": "walleye",
+              "os": "Android"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "system_webview_shell_layout_test_apk"
+      },
+      {
+        "args": [
+          "--enable-features=OutOfBlinkCors",
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "webview_cts_tests_oor_cors"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "name": "webview_cts_tests_oor_cors",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "chromium/android_webview/tools/cts_archive",
+              "location": "android_webview/tools/cts_archive",
+              "revision": "4kDr36wBuZtvbfaEin4U4oeFD7oAuN0flkWDImKBts4C"
+            },
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "PQ3A.190801.002",
+              "device_os_flavor": "google",
+              "device_os_type": "userdebug",
+              "device_type": "walleye",
+              "os": "Android"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ],
+          "shards": 3
+        },
+        "test": "webview_cts_tests"
+      },
+      {
+        "args": [
+          "--enable-features=OutOfBlinkCors",
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "webview_instrumentation_test_apk_oor_cors"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "name": "webview_instrumentation_test_apk_oor_cors",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "PQ3A.190801.002",
+              "device_os_flavor": "google",
+              "device_os_type": "userdebug",
+              "device_type": "walleye",
+              "os": "Android"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ],
+          "shards": 12
+        },
+        "test": "webview_instrumentation_test_apk"
+      },
+      {
+        "args": [
+          "--enable-features=OutOfBlinkCors",
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "webview_ui_test_app_test_apk_oor_cors"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "name": "webview_ui_test_app_test_apk_oor_cors",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "PQ3A.190801.002",
+              "device_os_flavor": "google",
+              "device_os_type": "userdebug",
+              "device_type": "walleye",
+              "os": "Android"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "webview_ui_test_app_test_apk"
+      }
+    ]
+  },
   "Memory Infra Tester": {
     "isolated_scripts": [
       {

testing/buildbot/test_suites.pyl

@@ -4830,6 +4830,15 @@
       },
     },
 
+    'system_webview_shell_instrumentation_tests_oor_cors': {
+      'system_webview_shell_layout_test_apk_oor_cors': {
+        'args': [
+          '--enable-features=OutOfBlinkCors',
+        ],
+        'test': 'system_webview_shell_layout_test_apk',
+      },
+    },
+
     'system_webview_wpt': {
       'system_webview_wpt': {
         'swarming': {
@@ -5004,10 +5013,27 @@
       },
     },
 
+    'webview_bot_instrumentation_test_apk_oor_cors_gtest': {
+      'webview_instrumentation_test_apk_oor_cors': {
+        'args': ['--enable-features=OutOfBlinkCors'],
+        'swarming': {
+          'shards': 12,
+        },
+        'test': 'webview_instrumentation_test_apk',
+      },
+    },
+
     'webview_bot_unittests_gtest': {
       'android_webview_unittests': {},
     },
 
+    'webview_bot_unittests_oor_cors_gtest': {
+      'android_webview_unittests_oor_cors': {
+        'args': ['--enable-features=OutOfBlinkCors'],
+        'test': 'android_webview_unittests',
+      },
+    },
+
     'webview_cts_tests_gtest': {
       'webview_cts_tests': {
         'swarming': {
@@ -5042,6 +5068,25 @@
       },
     },
 
+    'webview_cts_tests_gtest_oor_cors': {
+      'webview_cts_tests_oor_cors': {
+        'args': [
+          '--enable-features=OutOfBlinkCors',
+        ],
+        'swarming': {
+          'shards': 3,
+          'cipd_packages': [
+            {
+              "cipd_package": 'chromium/android_webview/tools/cts_archive',
+              'location': 'android_webview/tools/cts_archive',
+              'revision': '4kDr36wBuZtvbfaEin4U4oeFD7oAuN0flkWDImKBts4C',
+            }
+          ]
+        },
+        'test': 'webview_cts_tests',
+      },
+    },
+
     'webview_ui_instrumentation_tests': {
       'webview_ui_test_app_test_apk': {},
     },
@@ -5055,6 +5100,15 @@
       },
     },
 
+    'webview_ui_instrumentation_tests_oor_cors': {
+      'webview_ui_test_app_test_apk_oor_cors': {
+        'args': [
+          '--enable-features=OutOfBlinkCors',
+        ],
+        'test': 'webview_ui_test_app_test_apk',
+      },
+    },
+
     'win7_32_bit_gtests': {
       'base_unittests': {},
       'browser_tests': {
@@ -5935,6 +5989,14 @@
       'webview_ui_instrumentation_tests_no_field_trial',
     ],
 
+    'webview_bot_oor_cors_gtests': [
+      'system_webview_shell_instrumentation_tests_oor_cors',
+      'webview_bot_instrumentation_test_apk_oor_cors_gtest',
+      'webview_bot_unittests_oor_cors_gtest',
+      'webview_cts_tests_gtest_oor_cors',
+      'webview_ui_instrumentation_tests_oor_cors',
+    ],
+
     'webview_bot_system_gtests': [
       'system_webview_shell_instrumentation_tests',
       'system_webview_shell_instrumentation_tests_no_field_trial',

testing/buildbot/waterfalls.pyl

@@ -675,6 +675,17 @@
         'use_swarming': True,
         'os_type': 'android',
       },
+      'Android WebView P OOR-CORS FYI (rel)': {
+        'mixins': [
+          'pie_fleet',
+          'walleye',
+        ],
+        'test_suites': {
+          'gtest_tests': 'webview_bot_oor_cors_gtests',
+        },
+        'use_swarming': True,
+        'os_type': 'android',
+      },
       'Memory Infra Tester': {
         'mixins': [
           'kitkat',

tools/mb/mb_config.pyl

@@ -80,6 +80,7 @@
 
     'chromium.android.fyi': {
       'Android WebView P FYI (rel)': 'android_release_bot_minimal_symbols_arm64_webview_google',
+      'Android WebView P OOR-CORS FYI (rel)': 'android_release_bot_minimal_symbols_arm64_webview_google',
       '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',