weblayer, wpt: Move Android WPT builder to FYI waterfall

Builder is not ready to be on the main Android waterfall.
There are way to many failures on this builder. More work
needs to be done in order to turn it green.

Bug: 1126998, 1050760
Change-Id: Ie4c5eadacc2188bc89e948c571427dd2b5999bef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2404472Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Cr-Commit-Position: refs/heads/master@{#806029}

infra/config/generated/cr-buildbucket.cfg

@@ -9092,7 +9092,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android\",\"recipe\":\"chromium\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.android.fyi\",\"recipe\":\"chromium\"}"
       execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"

infra/config/generated/luci-milo.cfg

@@ -4255,11 +4255,6 @@ consoles {
     category: "builder_tester|arm64"
     short_name: "N"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/android-pie-arm64-wpt-rel-non-cq"
-    category: "builder_tester|arm64"
-    short_name: "P-WPT"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-rel"
     category: "builder_tester|x86"
@@ -4575,6 +4570,11 @@ consoles {
     category: "webview"
     short_name: "p-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-pie-arm64-wpt-rel-non-cq"
+    category: "builder_tester|arm64"
+    short_name: "P-WPT"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-marshmallow-x86-fyi-rel"
     category: "emulator|M|x86"

infra/config/subprojects/chromium/ci.star

@@ -860,7 +860,7 @@ ci.android_builder(
     tree_closing = True,
 )
 
-ci.android_builder(
+ci.android_fyi_builder(
     name = "android-pie-arm64-wpt-rel-non-cq",
     console_view_entry = ci.console_view_entry(
         category = "builder_tester|arm64",

testing/buildbot/chromium.android.fyi.json

@@ -314,6 +314,38 @@
       }
     ]
   },
+  "android-pie-arm64-wpt-rel-non-cq": {
+    "isolated_scripts": [
+      {
+        "isolate_name": "weblayer_shell_wpt",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "weblayer_shell_wpt",
+        "results_handler": "layout tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_os": "PQ3A.190801.002",
+              "device_os_flavor": "google",
+              "device_os_type": "userdebug",
+              "device_type": "walleye",
+              "os": "Android"
+            }
+          ],
+          "expiration": 18000,
+          "hard_timeout": 14400,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 15
+        },
+        "test_id_prefix": "ninja://weblayer/shell/android:weblayer_shell_wpt/"
+      }
+    ]
+  },
   "android-weblayer-pie-x86-fyi-rel": {
     "gtest_tests": [
       {

testing/buildbot/chromium.android.json

@@ -41298,38 +41298,6 @@
       }
     ]
   },
-  "android-pie-arm64-wpt-rel-non-cq": {
-    "isolated_scripts": [
-      {
-        "isolate_name": "weblayer_shell_wpt",
-        "merge": {
-          "args": [
-            "--verbose"
-          ],
-          "script": "//third_party/blink/tools/merge_web_test_results.py"
-        },
-        "name": "weblayer_shell_wpt",
-        "results_handler": "layout tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "device_os": "PQ3A.190801.002",
-              "device_os_flavor": "google",
-              "device_os_type": "userdebug",
-              "device_type": "walleye",
-              "os": "Android"
-            }
-          ],
-          "expiration": 18000,
-          "hard_timeout": 14400,
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 15
-        },
-        "test_id_prefix": "ninja://weblayer/shell/android:weblayer_shell_wpt/"
-      }
-    ]
-  },
   "android-pie-x86-rel": {
     "gtest_tests": [
       {

testing/buildbot/waterfalls.pyl

@@ -810,17 +810,6 @@
         'use_swarming': True,
         'os_type': 'android',
       },
-      'android-pie-arm64-wpt-rel-non-cq': {
-        'mixins': [
-          'pie_fleet',
-          'walleye',
-        ],
-        'test_suites': {
-          'isolated_scripts': 'weblayer_shell_wpt',
-        },
-        'use_swarming': True,
-        'os_type': 'android',
-      },
       'android-pie-x86-rel': {
         'mixins': [
           'pie-x86-emulator',
@@ -865,6 +854,17 @@
           'gtest_tests': 'android_marshmallow_emulator_backlog_gtests',
         }
       },
+      'android-pie-arm64-wpt-rel-non-cq': {
+        'mixins': [
+          'pie_fleet',
+          'walleye',
+        ],
+        'test_suites': {
+          'isolated_scripts': 'weblayer_shell_wpt',
+        },
+        'use_swarming': True,
+        'os_type': 'android',
+      },
       'android-weblayer-pie-x86-fyi-rel': {
         'mixins': [
           'pie-x86-emulator',

tools/mb/mb_config.pyl

@@ -107,7 +107,6 @@
       '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-arm64-wpt-rel-non-cq': 'android_release_bot_minimal_symbols_arm64',
       'android-pie-x86-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
       'android-10-arm64-rel': 'android_release_bot_minimal_symbols_arm64_fastbuild_webview_google',
     },
@@ -115,6 +114,7 @@
     'chromium.android.fyi': {
       'Android WebView P FYI (rel)': 'android_release_bot_minimal_symbols_arm64_webview_google',
       'android-marshmallow-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_resource_whitelisting_webview_google',
+      'android-pie-arm64-wpt-rel-non-cq': 'android_release_bot_minimal_symbols_arm64',
       'android-weblayer-pie-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
     },