Use the same Android devices for webrtc and webrtc.fyi bots.

Also remove the sharding that was introduced for debugging purpose.

Change-Id: Ibaaaa570aa31a1e768f3455927d61678410efd87
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6563823
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1463914}

infra/config/generated/builders/webrtc.fyi/WebRTC Chromium FYI Android Builder (dbg)/targets/chromium.webrtc.fyi.json

@@ -21,12 +21,14 @@
         "name": "content_browsertests",
         "swarming": {
           "dimensions": {
+            "device_os": "PQ3A.190801.002",
+            "device_os_flavor": "google",
             "device_os_type": "userdebug",
             "device_type": "walleye",
-            "os": "Android"
+            "os": "Android",
+            "pool": "chromium.tests"
           },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 4
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "content_browsertests",
         "test_id_prefix": "ninja://content/test:content_browsertests/"
@@ -50,9 +52,12 @@
         "name": "content_browsertests_sequential",
         "swarming": {
           "dimensions": {
+            "device_os": "PQ3A.190801.002",
+            "device_os_flavor": "google",
             "device_os_type": "userdebug",
             "device_type": "walleye",
-            "os": "Android"
+            "os": "Android",
+            "pool": "chromium.tests"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },

infra/config/generated/builders/webrtc.fyi/WebRTC Chromium FYI Android Builder ARM64 (dbg)/targets/chromium.webrtc.fyi.json

@@ -21,12 +21,14 @@
         "name": "content_browsertests",
         "swarming": {
           "dimensions": {
+            "device_os": "PQ3A.190801.002",
+            "device_os_flavor": "google",
             "device_os_type": "userdebug",
             "device_type": "walleye",
-            "os": "Android"
+            "os": "Android",
+            "pool": "chromium.tests"
           },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 4
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "content_browsertests",
         "test_id_prefix": "ninja://content/test:content_browsertests/"
@@ -50,9 +52,12 @@
         "name": "content_browsertests_sequential",
         "swarming": {
           "dimensions": {
+            "device_os": "PQ3A.190801.002",
+            "device_os_flavor": "google",
             "device_os_type": "userdebug",
             "device_type": "walleye",
-            "os": "Android"
+            "os": "Android",
+            "pool": "chromium.tests"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },

infra/config/generated/builders/webrtc.fyi/WebRTC Chromium FYI Android Tests (dbg)/targets/chromium.webrtc.fyi.json

@@ -20,12 +20,14 @@
         "name": "content_browsertests",
         "swarming": {
           "dimensions": {
+            "device_os": "PQ3A.190801.002",
+            "device_os_flavor": "google",
             "device_os_type": "userdebug",
             "device_type": "walleye",
-            "os": "Android"
+            "os": "Android",
+            "pool": "chromium.tests"
           },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 4
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "content_browsertests",
         "test_id_prefix": "ninja://content/test:content_browsertests/"
@@ -49,9 +51,12 @@
         "name": "content_browsertests_sequential",
         "swarming": {
           "dimensions": {
+            "device_os": "PQ3A.190801.002",
+            "device_os_flavor": "google",
             "device_os_type": "userdebug",
             "device_type": "walleye",
-            "os": "Android"
+            "os": "Android",
+            "pool": "chromium.tests"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },

infra/config/generated/builders/webrtc.fyi/WebRTC Chromium FYI Android Tests ARM64 (dbg)/targets/chromium.webrtc.fyi.json

@@ -20,12 +20,14 @@
         "name": "content_browsertests",
         "swarming": {
           "dimensions": {
+            "device_os": "PQ3A.190801.002",
+            "device_os_flavor": "google",
             "device_os_type": "userdebug",
             "device_type": "walleye",
-            "os": "Android"
+            "os": "Android",
+            "pool": "chromium.tests"
           },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 4
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "content_browsertests",
         "test_id_prefix": "ninja://content/test:content_browsertests/"
@@ -49,9 +51,12 @@
         "name": "content_browsertests_sequential",
         "swarming": {
           "dimensions": {
+            "device_os": "PQ3A.190801.002",
+            "device_os_flavor": "google",
             "device_os_type": "userdebug",
             "device_type": "walleye",
-            "os": "Android"
+            "os": "Android",
+            "pool": "chromium.tests"
           },
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },

infra/config/subprojects/webrtc/webrtc.fyi.star

@@ -251,16 +251,13 @@ builder(
             "webrtc_chromium_simple_gtests",
         ],
         mixins = [
-            "walleye",
+            "chromium_pixel_2_pie",
         ],
         per_test_modifications = {
             "content_browsertests": targets.mixin(
                 args = [
                     "--test-launcher-filter-file=../../testing/buildbot/filters/chromium.webrtc.fyi.android.tests.dbg.content_browsertests.filter",
                 ],
-                swarming = targets.swarming(
-                    shards = 4,
-                ),
             ),
         },
     ),
@@ -298,16 +295,13 @@ builder(
             "webrtc_chromium_simple_gtests",
         ],
         mixins = [
-            "walleye",
+            "chromium_pixel_2_pie",
         ],
         per_test_modifications = {
             "content_browsertests": targets.mixin(
                 args = [
                     "--test-launcher-filter-file=../../testing/buildbot/filters/chromium.webrtc.fyi.android.tests.dbg.content_browsertests.filter",
                 ],
-                swarming = targets.swarming(
-                    shards = 4,
-                ),
             ),
         },
     ),