Switch ANGLE to new GPU Android mixins

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

3 files changed, 21 insertions, 54 deletions

diff --git a/infra/specs/generate_test_spec_json.py b/infra/specs/generate_test_spec_json.py
index e15a82447d..31e9a9868c 100755
--- a/infra/specs/generate_test_spec_json.py
+++ b/infra/specs/generate_test_spec_json.py
@@ -53,39 +53,6 @@ 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 44822f4cf8..949a6270cf 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -13,28 +13,28 @@
 #
 # For more info see Chromium's mixins.pyl in testing/buildbot.
 
-{ '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}'],
+{ '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'}},
   'gpu-swarming-pool': { 'swarming': { 'dimensions': { 'pool': 'chromium.tests.gpu'}}},
+  'gpu_pixel_4_stable': { 'swarming': { 'dimensions': { 'device_os': 'RP1A.201105.002',
+                                                        'device_os_type': 'userdebug',
+                                                        'device_type': 'flame',
+                                                        'os': 'Android',
+                                                        'pool': 'chromium.tests.gpu'}}},
+  'gpu_pixel_6_experimental': { 'swarming': { 'dimensions': { 'device_os': 'AP1A.240405.002',
+                                                              'device_os_type': 'userdebug',
+                                                              'device_type': 'oriole',
+                                                              'os': 'Android',
+                                                              'pool': 'chromium.tests.gpu'}}},
+  'gpu_pixel_6_stable': { 'swarming': { 'dimensions': { 'device_os': 'TP1A.220624.021',
+                                                        'device_os_type': 'userdebug',
+                                                        'device_type': 'oriole',
+                                                        'os': 'Android',
+                                                        'pool': 'chromium.tests.gpu'}}},
   'limited_capacity_bot': {'swarming': {'expiration': 21600}},
   'linux-jammy': {'swarming': {'dimensions': {'os': 'Ubuntu-22.04'}}},
   'linux_amd_rx_5500_xt': { 'swarming': { 'dimensions': { 'display_attached': '1',
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 8e51e68266..d3ba3786ec 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -22,7 +22,7 @@
       'android-arm64-exp-pixel6': {  # android-arm64-pixel6 below for android-arm64-test
         'os_type': 'android',
         'mixins': [
-          'angle_pixel_6_experimental',
+          'gpu_pixel_6_experimental',
           'limited_capacity_bot',
         ],
         'test_suites': {
@@ -44,7 +44,7 @@
       'android-arm64-pixel4': {
         'os_type': 'android',
         'mixins': [
-          'angle_pixel_4_stable',
+          'gpu_pixel_4_stable',
         ],
         'test_suites': {
           'gtest_tests': 'android_gtests',
@@ -54,7 +54,7 @@
       'android-arm64-pixel4-perf': {
         'os_type': 'android',
         'mixins': [
-          'angle_pixel_4_stable',
+          'gpu_pixel_4_stable',
           'timeout_120m',
         ],
         'test_suites': {
@@ -64,7 +64,7 @@
       'android-arm64-pixel6': {
         'os_type': 'android',
         'mixins': [
-          'angle_pixel_6_stable',
+          'gpu_pixel_6_stable',
         ],
         'test_suites': {
           'gtest_tests': 'android_vulkan_gtests',
@@ -74,7 +74,7 @@
       'android-arm64-pixel6-perf': {
         'os_type': 'android',
         'mixins': [
-          'angle_pixel_6_stable',
+          'gpu_pixel_6_stable',
           'timeout_120m',
         ],
         'test_suites': {