Prepare ANGLE to use new Android mixins

Bug: chromium:338536265
Change-Id: I225b79cb1a26b63cb74f0d2bd2c1f14048882722
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5514150
Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>

4 files changed, 86 insertions, 55 deletions

diff --git a/infra/specs/angle.json b/infra/specs/angle.json
index 2d2cbff576..d599aee141 100644
--- a/infra/specs/angle.json
+++ b/infra/specs/angle.json
@@ -1208,7 +1208,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1233,7 +1233,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1259,7 +1259,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1285,7 +1285,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1311,7 +1311,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1336,7 +1336,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1361,7 +1361,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1387,7 +1387,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1412,7 +1412,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1438,7 +1438,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1463,7 +1463,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1492,7 +1492,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1520,7 +1520,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1548,7 +1548,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1576,7 +1576,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1605,7 +1605,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1634,7 +1634,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1662,7 +1662,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1690,7 +1690,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1718,7 +1718,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1746,7 +1746,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1772,7 +1772,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1800,7 +1800,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1823,7 +1823,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1848,7 +1848,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1875,7 +1875,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1909,7 +1909,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1940,7 +1940,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -1970,7 +1970,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -2000,7 +2000,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -2030,7 +2030,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -2060,7 +2060,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
@@ -2090,7 +2090,7 @@
         "swarming": {
           "containment_type": "AUTO",
           "dimensions": {
-            "device_os": "R",
+            "device_os": "RP1A.201105.002",
             "device_os_type": "userdebug",
             "device_type": "flame",
             "os": "Android",
diff --git a/infra/specs/generate_test_spec_json.py b/infra/specs/generate_test_spec_json.py
index 31e9a9868c..e15a82447d 100755
--- a/infra/specs/generate_test_spec_json.py
+++ b/infra/specs/generate_test_spec_json.py
@@ -53,6 +53,39 @@ ADDITIONAL_MIXINS = {
             }
         }
     },
+    'angle_pixel_4_stable': {
+        'swarming': {
+            'dimensions': {
+                "os": "Android",
+                "device_type": "flame",
+                "device_os": "RP1A.201105.002",
+                "device_os_type": "userdebug",
+                "pool": "chromium.tests.gpu",
+            }
+        }
+    },
+    'angle_pixel_6_stable': {
+        'swarming': {
+            'dimensions': {
+                "os": "Android",
+                "device_type": "oriole",
+                "device_os": "TP1A.220624.021",
+                "device_os_type": "userdebug",
+                "pool": "chromium.tests.gpu",
+            }
+        }
+    },
+    'angle_pixel_6_experimental': {
+        'swarming': {
+            'dimensions': {
+                "os": "Android",
+                "device_type": "oriole",
+                "device_os": "AP1A.240405.002",
+                "device_os_type": "userdebug",
+                "pool": "chromium.tests.gpu",
+            }
+        }
+    },
     'timeout_120m': {
         'swarming': {
             'hard_timeout': 7200,
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 5d1b22e1a2..44822f4cf8 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -13,17 +13,27 @@
 #
 # For more info see Chromium's mixins.pyl in testing/buildbot.
 
-{ 'android_r': {'swarming': {'dimensions': {'device_os': 'R'}}},
-  'android_t': {'swarming': {'dimensions': {'device_os': 'TP1A.220624.021'}}},
-  'android_u': {'swarming': {'dimensions': {'device_os': 'AP1A.240405.002'}}},
+{ 'angle_pixel_4_stable': { 'swarming': { 'dimensions': { 'device_os': 'RP1A.201105.002',
+                                                          'device_os_type': 'userdebug',
+                                                          'device_type': 'flame',
+                                                          'os': 'Android',
+                                                          'pool': 'chromium.tests.gpu'}}},
+  'angle_pixel_6_experimental': { 'swarming': { 'dimensions': { 'device_os': 'AP1A.240405.002',
+                                                                'device_os_type': 'userdebug',
+                                                                'device_type': 'oriole',
+                                                                'os': 'Android',
+                                                                'pool': 'chromium.tests.gpu'}}},
+  'angle_pixel_6_stable': { 'swarming': { 'dimensions': { 'device_os': 'TP1A.220624.021',
+                                                          'device_os_type': 'userdebug',
+                                                          'device_type': 'oriole',
+                                                          'os': 'Android',
+                                                          'pool': 'chromium.tests.gpu'}}},
   'angle_skia_gold_test': { 'args': ['--git-revision=${got_angle_revision}'],
                             'precommit_args': [ '--gerrit-issue=${patch_issue}',
                                                 '--gerrit-patchset=${patch_set}',
                                                 '--buildbucket-id=${buildbucket_build_id}',
                                                 '--use-permissive-pixel-comparison=${use_permissive_angle_pixel_comparison}']},
   'chromium-tester-service-account': { 'swarming': { 'service_account': 'chromium-tester@chops-service-accounts.iam.gserviceaccount.com'}},
-  'flame': { 'swarming': { 'dimensions': { 'device_type': 'flame',
-                                           'os': 'Android'}}},
   'gpu-swarming-pool': { 'swarming': { 'dimensions': { 'pool': 'chromium.tests.gpu'}}},
   'limited_capacity_bot': {'swarming': {'expiration': 21600}},
   'linux-jammy': {'swarming': {'dimensions': {'os': 'Ubuntu-22.04'}}},
@@ -74,8 +84,6 @@
                                                                   'os': 'Mac-11.7.9',
                                                                   'pool': 'chromium.tests.gpu'}}},
   'no_gpu': {'swarming': {'dimensions': {'gpu': 'none'}}},
-  'oriole': { 'swarming': { 'dimensions': { 'device_type': 'oriole',
-                                            'os': 'Android'}}},
   'samsung_s22': { 'swarming': { 'dimensions': { 'device_os': 'UP1A.231005.007',
                                                  'device_os_type': 'user',
                                                  'device_type': 's5e9925',
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index da96a99bac..8e51e68266 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -22,9 +22,7 @@
       'android-arm64-exp-pixel6': {  # android-arm64-pixel6 below for android-arm64-test
         'os_type': 'android',
         'mixins': [
-          'android_u',
-          'oriole',
-          'gpu-swarming-pool',
+          'angle_pixel_6_experimental',
           'limited_capacity_bot',
         ],
         'test_suites': {
@@ -46,9 +44,7 @@
       'android-arm64-pixel4': {
         'os_type': 'android',
         'mixins': [
-          'android_r',
-          'flame',
-          'gpu-swarming-pool',
+          'angle_pixel_4_stable',
         ],
         'test_suites': {
           'gtest_tests': 'android_gtests',
@@ -58,9 +54,7 @@
       'android-arm64-pixel4-perf': {
         'os_type': 'android',
         'mixins': [
-          'android_r',
-          'flame',
-          'gpu-swarming-pool',
+          'angle_pixel_4_stable',
           'timeout_120m',
         ],
         'test_suites': {
@@ -70,9 +64,7 @@
       'android-arm64-pixel6': {
         'os_type': 'android',
         'mixins': [
-          'android_t',
-          'oriole',
-          'gpu-swarming-pool',
+          'angle_pixel_6_stable',
         ],
         'test_suites': {
           'gtest_tests': 'android_vulkan_gtests',
@@ -82,9 +74,7 @@
       'android-arm64-pixel6-perf': {
         'os_type': 'android',
         'mixins': [
-          'android_t',
-          'oriole',
-          'gpu-swarming-pool',
+          'angle_pixel_6_stable',
           'timeout_120m',
         ],
         'test_suites': {