Change android-oreo-arm64-rel to android-pie-arm64-rel, chromium side changes.

Bug: 1001679
Change-Id: Ia61af264eac4ed9f683eb2350a99ecdf3c21c72f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1790406
Commit-Queue: Andrew Luo <aluo@chromium.org>
Reviewed-by: Yun Liu <yliuyliu@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694519}

infra/config/cr-buildbucket.cfg

@@ -1343,7 +1343,7 @@ buckets {
     }
 
     builders {
-      name: "android-oreo-arm64-rel"
+      name: "android-pie-arm64-rel"
       mixins: "android-ci"
       mixins: "linux-xenial"
       mixins: "builderless"
@@ -4057,7 +4057,7 @@ buckets {
     }
     builders {
       mixins: "android-try"
-      name: "android-oreo-arm64-rel"
+      name: "android-pie-arm64-rel"
       mixins: "linux-xenial"
       mixins: "builderless"
     }

infra/config/luci-milo.cfg

@@ -1613,9 +1613,9 @@ consoles {
     short_name: "san"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/android-oreo-arm64-rel"
+    name: "buildbucket/luci.chromium.ci/android-pie-arm64-rel"
     category: "on_cq|future"
-    short_name: "O"
+    short_name: "P"
   }
 }
 
@@ -4327,7 +4327,7 @@ consoles {
     name: "buildbucket/luci.chromium.try/android-marshmallow-x86-fyi-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/android-oreo-arm64-rel"
+    name: "buildbucket/luci.chromium.try/android-pie-arm64-rel"
   }
   builders {
     name: "buildbucket/luci.chromium.try/android_optional_gpu_tests_rel"
@@ -4991,7 +4991,7 @@ consoles {
     name: "buildbucket/luci.chromium.try/android-oreo-arm64-cts-networkservice-dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/android-oreo-arm64-rel"
+    name: "buildbucket/luci.chromium.try/android-pie-arm64-rel"
   }
   builders {
     name: "buildbucket/luci.chromium.try/android_archive_rel_ng"

infra/config/luci-scheduler.cfg

@@ -326,7 +326,7 @@ trigger {
   triggers: "android-kitkat-arm-rel"
   triggers: "android-marshmallow-arm64-rel"
   triggers: "android-mojo-webview-rel"
-  triggers: "android-oreo-arm64-rel"
+  triggers: "android-pie-arm64-rel"
   triggers: "android-archive-rel"
   triggers: "chromeos-amd64-generic-asan-rel"
   triggers: "chromeos-amd64-generic-cfi-thin-lto-rel"
@@ -916,12 +916,12 @@ job {
 }
 
 job {
-  id: "android-oreo-arm64-rel"
+  id: "android-pie-arm64-rel"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "android-oreo-arm64-rel"
+    builder: "android-pie-arm64-rel"
   }
 }
 

testing/buildbot/test_suites.pyl

@@ -5118,14 +5118,6 @@
       'android_vega_vr_gtests',
     ],
 
-    'android_oreo_rel_gtests': [
-      'android_monochrome_smoke_tests',
-      'android_smoke_tests',
-      'system_webview_shell_instrumentation_tests',
-      'webview_cts_tests_gtest',
-      'webview_ui_instrumentation_tests',
-    ],
-
     'android_pie_gtests': [
       'android_ar_gtests',
       'android_ddready_vr_gtests',
@@ -5136,6 +5128,14 @@
       # O only.
     ],
 
+    'android_pie_rel_gtests': [
+      'android_monochrome_smoke_tests',
+      'android_smoke_tests',
+      'system_webview_shell_instrumentation_tests',
+      'webview_cts_tests_gtest',
+      'webview_ui_instrumentation_tests',
+    ],
+
     'bfcache_android_gtests': [
       'bfcache_generic_gtests',
       'bfcache_android_specific_gtests',

testing/buildbot/waterfalls.pyl

@@ -592,17 +592,6 @@
         },
         'os_type': 'android',
       },
-      'android-oreo-arm64-rel': {
-        'mixins': [
-          'oreo_fleet',
-          'walleye',
-        ],
-        'test_suites': {
-          'gtest_tests': 'android_oreo_rel_gtests',
-        },
-        'use_swarming': True,
-        'os_type': 'android',
-      },
       'android-pie-arm64-dbg': {
         'swarming': {
           'dimension_sets': [
@@ -618,6 +607,17 @@
           'gtest_tests': 'android_pie_gtests',
         }
       },
+      'android-pie-arm64-rel': {
+        'mixins': [
+          'pie_fleet',
+          'walleye',
+        ],
+        'test_suites': {
+          'gtest_tests': 'android_pie_rel_gtests',
+        },
+        'use_swarming': True,
+        'os_type': 'android',
+      },
     },
   },
   {

tools/mb/mb_config.pyl

@@ -71,7 +71,8 @@
       # This bot must use the gpu_tests mixin to match 'Android FYI Release (Nexus 5X)'
       # on the chromium.gpu waterfall, which it mirrors via trybots.pyl.
       'android-marshmallow-arm64-rel': 'gpu_tests_android_release_bot_minimal_symbols_arm64',
-      'android-oreo-arm64-rel': 'android_release_bot_minimal_symbols_arm64_webview_google',
+
+      'android-pie-arm64-rel': 'android_release_bot_minimal_symbols_arm64_webview_google',
     },
 
     'chromium.android.fyi': {
@@ -648,7 +649,7 @@
       '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-arm64-rel': 'android_release_trybot_arm64_webview_google',
       'android-pie-x86-fyi-rel': 'android_release_trybot_x86',
       'android_archive_rel_ng': 'android_release_trybot',
       'android_arm64_dbg_recipe': 'android_debug_trybot_compile_only_arm64',