weblayer, skew tests: Add pie tester that runs skew tests

Replace android-weblayer-pie-x86-fyi-rel with a pie tester that will
run skew tests on weblayer.

Bug: 1114563
Change-Id: I41bba86bb23e7790327f771b4752cc7804a9a72a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2504589
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Reviewed-by: Haiyang Pan <hypan@google.com>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Cr-Commit-Position: refs/heads/master@{#822809}

diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg
index 3f2a593..08461304 100644
--- a/infra/config/generated/commit-queue.cfg
+++ b/infra/config/generated/commit-queue.cfg

@@ -306,10 +306,6 @@
         includable_only: true
       }
       builders {
-        name: "chromium/try/android-weblayer-pie-x86-fyi-rel"
-        includable_only: true
-      }
-      builders {
         name: "chromium/try/android-webview-marshmallow-arm64-dbg"
         includable_only: true
       }

diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 3de0132..f1d5e50 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg

@@ -12961,7 +12961,7 @@
       }
     }
     builders {
-      name: "android-weblayer-pie-x86-fyi-rel"
+      name: "android-weblayer-pie-x86-rel-tests"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
@@ -21132,51 +21132,6 @@
       }
     }
     builders {
-      name: "android-weblayer-pie-x86-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: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      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\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.resultdb.result_sink"
-        value: 0
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-      }
-    }
-    builders {
       name: "android-webview-marshmallow-arm64-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"

diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
index 9ae68b6..11f8609 100644
--- a/infra/config/generated/luci-milo.cfg
+++ b/infra/config/generated/luci-milo.cfg

@@ -3062,11 +3062,6 @@
     short_name: "cfi"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/android-weblayer-pie-x86-fyi-rel"
-    category: "weblayer"
-    short_name: "p-x86-rel"
-  }
-  builders {
     name: "buildbucket/luci.chromium.ci/Android WebView P FYI (rel)"
     category: "webview"
     short_name: "p-rel"
@@ -3101,6 +3096,11 @@
     category: "tester|weblayer"
     short_name: "10"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-weblayer-pie-x86-rel-tests"
+    category: "tester|weblayer"
+    short_name: "P"
+  }
   header {
     oncalls {
       name: "Chromium"
@@ -11091,9 +11091,6 @@
     name: "buildbucket/luci.chromium.try/android-pie-x86-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/android-weblayer-pie-x86-fyi-rel"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/android-webview-marshmallow-arm64-dbg"
   }
   builders {
@@ -12025,9 +12022,6 @@
     name: "buildbucket/luci.chromium.try/android-pie-x86-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/android-weblayer-pie-x86-fyi-rel"
-  }
-  builders {
     name: "buildbucket/luci.chromium.try/android-webview-marshmallow-arm64-dbg"
   }
   builders {

diff --git a/infra/config/generated/luci-notify.cfg b/infra/config/generated/luci-notify.cfg
index 6e2c9c0..4256fb2e 100644
--- a/infra/config/generated/luci-notify.cfg
+++ b/infra/config/generated/luci-notify.cfg

@@ -2392,8 +2392,19 @@
   }
   builders {
     bucket: "ci"
-    name: "android-weblayer-pie-x86-fyi-rel"
-    repository: "https://chromium.googlesource.com/chromium/src"
+    name: "android-weblayer-pie-x86-rel-tests"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "weblayer-sheriff@grotations.appspotmail.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "android-weblayer-x86-fyi-rel-10-tests"
   }
 }
 notifiers {

diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
index f58f934..b29b18c 100644
--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg

@@ -4654,13 +4654,17 @@
   }
 }
 job {
-  id: "android-weblayer-pie-x86-fyi-rel"
+  id: "android-weblayer-pie-x86-rel-tests"
   realm: "ci"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "android-weblayer-pie-x86-fyi-rel"
+    builder: "android-weblayer-pie-x86-rel-tests"
   }
 }
 job {
@@ -6475,7 +6479,6 @@
   triggers: "android-pie-arm64-wpt-rel-non-cq"
   triggers: "android-pie-x86-fyi-rel"
   triggers: "android-pie-x86-rel"
-  triggers: "android-weblayer-pie-x86-fyi-rel"
   triggers: "android-weblayer-x86-fyi-rel"
   triggers: "chromeos-amd64-generic-asan-rel"
   triggers: "chromeos-amd64-generic-cfi-thin-lto-rel"

diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
index 74a363ba..5296d175 100644
--- a/infra/config/subprojects/chromium/ci.star
+++ b/infra/config/subprojects/chromium/ci.star

@@ -974,11 +974,12 @@
 )
 
 ci.android_fyi_builder(
-    name = "android-weblayer-pie-x86-fyi-rel",
+    name = "android-weblayer-pie-x86-rel-tests",
     console_view_entry = ci.console_view_entry(
-        category = "weblayer",
-        short_name = "p-x86-rel",
+        category = "tester|weblayer",
+        short_name = "P",
     ),
+    triggered_by = ["android-weblayer-x86-fyi-rel"],
     notifies = ["weblayer-sheriff"],
 )
 
@@ -997,6 +998,7 @@
         short_name = "10",
     ),
     triggered_by = ["android-weblayer-x86-fyi-rel"],
+    notifies = ["weblayer-sheriff"],
 )
 
 ci.android_fyi_builder(

diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star
index e49a5ff..4265ec2d 100644
--- a/infra/config/subprojects/chromium/try.star
+++ b/infra/config/subprojects/chromium/try.star

@@ -425,10 +425,6 @@
 )
 
 try_.chromium_android_builder(
-    name = "android-weblayer-pie-x86-fyi-rel",
-)
-
-try_.chromium_android_builder(
     name = "android-webview-marshmallow-arm64-dbg",
 )
 

diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
index 0c00668..2792fa5 100644
--- a/testing/buildbot/chromium.android.fyi.json
+++ b/testing/buildbot/chromium.android.fyi.json

@@ -3009,7 +3009,7 @@
       }
     ]
   },
-  "android-weblayer-pie-x86-fyi-rel": {
+  "android-weblayer-pie-x86-rel-tests": {
     "gtest_tests": [
       {
         "args": [

diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 14466e4..db070e7 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl

@@ -1065,7 +1065,7 @@
         'use_swarming': True,
         'os_type': 'android',
       },
-      'android-weblayer-pie-x86-fyi-rel': {
+      'android-weblayer-pie-x86-rel-tests': {
         'mixins': [
           'pie-x86-emulator',
           'emulator-4-cores',

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 966eaa6..eda490e 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl

@@ -129,7 +129,6 @@
       'android-inverse-fieldtrials-pie-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google_invert_fieldtrials',
       'android-pie-arm64-wpt-rel-non-cq': 'android_release_bot_minimal_symbols_arm64_webview_google',
       'android-weblayer-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
-      'android-weblayer-pie-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
     },
 
     'chromium.chromiumos': {

diff --git a/tools/mb/mb_config_expectations/chromium.android.fyi.json b/tools/mb/mb_config_expectations/chromium.android.fyi.json
index 368d264..32d6f62 100644
--- a/tools/mb/mb_config_expectations/chromium.android.fyi.json
+++ b/tools/mb/mb_config_expectations/chromium.android.fyi.json

@@ -60,22 +60,6 @@
       "use_goma": true
     }
   },
-  "android-weblayer-pie-x86-fyi-rel": {
-    "gn_args": {
-      "disable_android_lint": true,
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "strip_debug_info": true,
-      "symbol_level": 1,
-      "system_webview_package_name": "com.google.android.webview",
-      "target_cpu": "x86",
-      "target_os": "android",
-      "use_errorprone_java_compiler": false,
-      "use_goma": true
-    }
-  },
   "android-weblayer-x86-fyi-rel": {
     "gn_args": {
       "disable_android_lint": true,