Add android_oreo_standard_gtests to android-oreo-arm64-rel bot

Change-Id: I932940a233e7e92c6474d4d3d85c69e92eae8eb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739158Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Andrew Luo <aluo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685227}

testing/buildbot/chromium.android.json

@@ -26162,6 +26162,52 @@
   },
   "android-oreo-arm64-rel": {
     "gtest_tests": [
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "chrome_public_test_apk"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "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": "OPM1.171019.021",
+              "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": 5
+        },
+        "test": "chrome_public_test_apk"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",
@@ -26258,6 +26304,53 @@
         },
         "test": "webview_cts_tests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "webview_instrumentation_test_apk"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "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": "OPM1.171019.021",
+              "device_os_flavor": "google",
+              "device_os_type": "userdebug",
+              "device_type": "walleye",
+              "os": "Android"
+            }
+          ],
+          "expiration": 10800,
+          "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": 5
+        },
+        "test": "webview_instrumentation_test_apk"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",

testing/buildbot/test_suites.pyl

@@ -4850,6 +4850,13 @@
       'android_vega_vr_gtests',
     ],
 
+    'android_oreo_rel_gtests': [
+      'android_oreo_standard_gtests',
+      'system_webview_shell_instrumentation_tests',
+      'webview_cts_tests_gtest',
+      'webview_ui_instrumentation_tests',
+    ],
+
     'android_pie_gtests': [
       'android_ddready_vr_gtests',
       'android_ar_gtests',
@@ -5538,8 +5545,8 @@
 
     'webview_bot_gtests': [
       'system_webview_shell_instrumentation_tests',
-      'webview_ui_instrumentation_tests',
       'webview_cts_tests_gtest',
+      'webview_ui_instrumentation_tests',
     ],
   }
 }

testing/buildbot/waterfalls.pyl

@@ -586,7 +586,7 @@
           'walleye',
         ],
         'test_suites': {
-          'gtest_tests': 'webview_bot_gtests',
+          'gtest_tests': 'android_oreo_rel_gtests',
         },
         'use_swarming': True,
         'os_type': 'android',