[go: nahoru, domu]

Add chromeos_system_friendly_gtests to brya-skylab builder

These tests are run on betty-pi-arc builder today.

Bug: b:311608250
Change-Id: I60345f23c9298035718bed1ba5ed96f2eefc8651
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5143750
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Tatsuhisa Yamaguchi <yamaguchi@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1244517}
diff --git a/infra/config/generated/testing/mixins.pyl b/infra/config/generated/testing/mixins.pyl
index 6172e77..db5e69cc 100644
--- a/infra/config/generated/testing/mixins.pyl
+++ b/infra/config/generated/testing/mixins.pyl
@@ -1132,10 +1132,14 @@
       },
     },
   },
-  'vaapi_unittest_libfake_args': {
+  'vaapi_unittest_args': {
     'args': [
       '--stop-ui',
       '--gtest_filter="VaapiTest.*"',
+    ],
+  },
+  'vaapi_unittest_libfake_args': {
+    'args': [
       '--env-var',
       'LIBVA_DRIVERS_PATH',
       './',
diff --git a/infra/config/generated/testing/test_suites.pyl b/infra/config/generated/testing/test_suites.pyl
index 2387635..b2802f8 100644
--- a/infra/config/generated/testing/test_suites.pyl
+++ b/infra/config/generated/testing/test_suites.pyl
@@ -702,13 +702,25 @@
       'rust_gtest_interop_unittests': {},
       'sql_unittests': {},
       'url_unittests': {},
+    },
+
+    'chromeos_vaapi_fakelib_gtests': {
       'vaapi_unittest': {
         'mixins': [
+          'vaapi_unittest_args',
           'vaapi_unittest_libfake_args',
         ],
       },
     },
 
+    'chromeos_vaapi_gtests': {
+      'vaapi_unittest': {
+        'mixins': [
+          'vaapi_unittest_args',
+        ],
+      },
+    },
+
     'chromium_android_scripts': {
       'check_network_annotations': {
         'script': 'check_network_annotations.py',
@@ -4233,6 +4245,7 @@
       'ozone_unittests': {},
       'vaapi_unittest': {
         'mixins': [
+          'vaapi_unittest_args',
           'vaapi_unittest_libfake_args',
         ],
       },
@@ -5872,6 +5885,7 @@
     'chromeos_vm_gtests': [
       'chromeos_integration_tests',
       'chromeos_system_friendly_gtests',
+      'chromeos_vaapi_fakelib_gtests',
     ],
 
     'chromeos_vm_gtests_and_tast': [
@@ -5879,6 +5893,7 @@
       'chromeos_browser_integration_tests',
       'chromeos_integration_tests',
       'chromeos_system_friendly_gtests',
+      'chromeos_vaapi_fakelib_gtests',
     ],
 
     'chromeos_vm_tast': [
@@ -6796,12 +6811,17 @@
           'CROS_BRYA_RELEASE_ASH_LKGM',
         ],
       },
-      'chromeos_device_only_gtests': {
+      'chromeos_integration_tests': {
         'variants': [
           'CROS_BRYA_RELEASE_ASH_LKGM',
         ],
       },
-      'chromeos_integration_tests': {
+      'chromeos_system_friendly_gtests': {
+        'variants': [
+          'CROS_BRYA_RELEASE_ASH_LKGM',
+        ],
+      },
+      'chromeos_vaapi_gtests': {
         'variants': [
           'CROS_BRYA_RELEASE_ASH_LKGM',
         ],
diff --git a/infra/config/targets/basic_suites.star b/infra/config/targets/basic_suites.star
index 10c6f33..5c0f7349 100644
--- a/infra/config/targets/basic_suites.star
+++ b/infra/config/targets/basic_suites.star
@@ -725,8 +725,28 @@
         "rust_gtest_interop_unittests": targets.legacy_test_config(),
         "sql_unittests": targets.legacy_test_config(),
         "url_unittests": targets.legacy_test_config(),
+    },
+)
+
+# vaapi_unittest needs to run with fake driver in some builders but others with real driver.
+# Therefore these were isolated from chromeos_system_friendly_gtests.
+targets.legacy_basic_suite(
+    name = "chromeos_vaapi_gtests",
+    tests = {
         "vaapi_unittest": targets.legacy_test_config(
             mixins = [
+                "vaapi_unittest_args",
+            ],
+        ),
+    },
+)
+
+targets.legacy_basic_suite(
+    name = "chromeos_vaapi_fakelib_gtests",
+    tests = {
+        "vaapi_unittest": targets.legacy_test_config(
+            mixins = [
+                "vaapi_unittest_args",
                 "vaapi_unittest_libfake_args",
             ],
         ),
@@ -3874,6 +3894,7 @@
         "ozone_unittests": targets.legacy_test_config(),
         "vaapi_unittest": targets.legacy_test_config(
             mixins = [
+                "vaapi_unittest_args",
                 "vaapi_unittest_libfake_args",
             ],
         ),
diff --git a/infra/config/targets/compound_suites.star b/infra/config/targets/compound_suites.star
index 14035aa1..17957957 100644
--- a/infra/config/targets/compound_suites.star
+++ b/infra/config/targets/compound_suites.star
@@ -179,6 +179,7 @@
     name = "chromeos_vm_gtests",
     basic_suites = [
         "chromeos_system_friendly_gtests",
+        "chromeos_vaapi_fakelib_gtests",
         "chromeos_integration_tests",
     ],
 )
@@ -189,6 +190,7 @@
         "chromeos_browser_all_tast_tests",
         "chromeos_browser_integration_tests",
         "chromeos_system_friendly_gtests",
+        "chromeos_vaapi_fakelib_gtests",
         "chromeos_integration_tests",
     ],
 )
diff --git a/infra/config/targets/matrix_compound_suites.star b/infra/config/targets/matrix_compound_suites.star
index 3e96ce7..c21b207 100644
--- a/infra/config/targets/matrix_compound_suites.star
+++ b/infra/config/targets/matrix_compound_suites.star
@@ -147,12 +147,17 @@
                 "CROS_BRYA_RELEASE_ASH_LKGM",
             ],
         ),
-        "chromeos_device_only_gtests": targets.legacy_matrix_config(
+        "chromeos_integration_tests": targets.legacy_matrix_config(
             variants = [
                 "CROS_BRYA_RELEASE_ASH_LKGM",
             ],
         ),
-        "chromeos_integration_tests": targets.legacy_matrix_config(
+        "chromeos_system_friendly_gtests": targets.legacy_matrix_config(
+            variants = [
+                "CROS_BRYA_RELEASE_ASH_LKGM",
+            ],
+        ),
+        "chromeos_vaapi_gtests": targets.legacy_matrix_config(
             variants = [
                 "CROS_BRYA_RELEASE_ASH_LKGM",
             ],
diff --git a/infra/config/targets/mixins.star b/infra/config/targets/mixins.star
index 87fca80..3e16085 100644
--- a/infra/config/targets/mixins.star
+++ b/infra/config/targets/mixins.star
@@ -1440,10 +1440,16 @@
 )
 
 targets.mixin(
-    name = "vaapi_unittest_libfake_args",
+    name = "vaapi_unittest_args",
     args = [
         "--stop-ui",
         "--gtest_filter=\"VaapiTest.*\"",
+    ],
+)
+
+targets.mixin(
+    name = "vaapi_unittest_libfake_args",
+    args = [
         # Tell libva to do dummy encoding/decoding. For more info, see:
         # https://github.com/intel/libva/blob/v2.14-branch/va/va_fool.c#L52
         "--env-var",
diff --git a/testing/buildbot/chrome.json b/testing/buildbot/chrome.json
index 92790523d..d5d42ba3 100644
--- a/testing/buildbot/chrome.json
+++ b/testing/buildbot/chrome.json
@@ -1173,6 +1173,19 @@
     ],
     "skylab_tests": [
       {
+        "args": [
+          "--ozone-platform=headless"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "aura_unittests BRYA_RELEASE_LKGM",
+        "test": "aura_unittests",
+        "test_id_prefix": "ninja://ui/aura:aura_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
         "autotest_name": "chromium",
         "cros_board": "brya",
         "dut_pool": "chrome",
@@ -1183,6 +1196,30 @@
         "variant_id": "BRYA_RELEASE_LKGM"
       },
       {
+        "args": [
+          "--test-launcher-jobs=1",
+          "--gtest_filter=-*UsingRealWebcam_CaptureMjpeg*"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "capture_unittests BRYA_RELEASE_LKGM",
+        "test": "capture_unittests",
+        "test_id_prefix": "ninja://media/capture:capture_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "cc_unittests BRYA_RELEASE_LKGM",
+        "test": "cc_unittests",
+        "test_id_prefix": "ninja://cc:cc_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
         "autotest_name": "tast.chrome-from-gcs",
         "cros_board": "brya",
         "dut_pool": "chrome",
@@ -1237,6 +1274,233 @@
         "test_id_prefix": "ninja://chrome/test:chromeos_integration_tests/",
         "use_lkgm": true,
         "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "crypto_unittests BRYA_RELEASE_LKGM",
+        "test": "crypto_unittests",
+        "test_id_prefix": "ninja://crypto:crypto_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "display_unittests BRYA_RELEASE_LKGM",
+        "test": "display_unittests",
+        "test_id_prefix": "ninja://ui/display:display_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--env-var",
+          "LIBVA_DRIVERS_PATH",
+          "./",
+          "--env-var",
+          "LIBVA_DRIVER_NAME",
+          "libfake"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "experiment_percentage": 100,
+        "name": "fake_libva_driver_unittest BRYA_RELEASE_LKGM",
+        "test": "fake_libva_driver_unittest",
+        "test_id_prefix": "ninja://media/gpu/vaapi/test/fake_libva_driver:fake_libva_driver_unittest/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "google_apis_unittests BRYA_RELEASE_LKGM",
+        "test": "google_apis_unittests",
+        "test_id_prefix": "ninja://google_apis:google_apis_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "ipc_tests BRYA_RELEASE_LKGM",
+        "test": "ipc_tests",
+        "test_id_prefix": "ninja://ipc:ipc_tests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "latency_unittests BRYA_RELEASE_LKGM",
+        "test": "latency_unittests",
+        "test_id_prefix": "ninja://ui/latency:latency_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "libcups_unittests BRYA_RELEASE_LKGM",
+        "test": "libcups_unittests",
+        "test_id_prefix": "ninja://chrome/services/cups_proxy:libcups_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.media_unittests.filter"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "media_unittests BRYA_RELEASE_LKGM",
+        "test": "media_unittests",
+        "test_id_prefix": "ninja://media:media_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "midi_unittests BRYA_RELEASE_LKGM",
+        "test": "midi_unittests",
+        "test_id_prefix": "ninja://media/midi:midi_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "mojo_unittests BRYA_RELEASE_LKGM",
+        "test": "mojo_unittests",
+        "test_id_prefix": "ninja://mojo:mojo_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--vpython-dir=../../vpython_dir_linux_amd64",
+          "--gtest_filter=-PythonUtils.PythonRunTime"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "net_unittests BRYA_RELEASE_LKGM",
+        "test": "net_unittests",
+        "test_id_prefix": "ninja://net:net_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--stop-ui"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "ozone_gl_unittests BRYA_RELEASE_LKGM",
+        "test": "ozone_gl_unittests",
+        "test_id_prefix": "ninja://ui/ozone/gl:ozone_gl_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "ozone_unittests BRYA_RELEASE_LKGM",
+        "test": "ozone_unittests",
+        "test_id_prefix": "ninja://ui/ozone:ozone_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "pdf_unittests BRYA_RELEASE_LKGM",
+        "test": "pdf_unittests",
+        "test_id_prefix": "ninja://pdf:pdf_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "printing_unittests BRYA_RELEASE_LKGM",
+        "test": "printing_unittests",
+        "test_id_prefix": "ninja://printing:printing_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--stop-ui",
+          "--test-launcher-jobs=1"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "profile_provider_unittest BRYA_RELEASE_LKGM",
+        "test": "profile_provider_unittest",
+        "test_id_prefix": "ninja://chrome/browser/metrics/perf:profile_provider_unittest/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "rust_gtest_interop_unittests BRYA_RELEASE_LKGM",
+        "test": "rust_gtest_interop_unittests",
+        "test_id_prefix": "ninja://testing/rust_gtest_interop:rust_gtest_interop_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "sql_unittests BRYA_RELEASE_LKGM",
+        "test": "sql_unittests",
+        "test_id_prefix": "ninja://sql:sql_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "url_unittests BRYA_RELEASE_LKGM",
+        "test": "url_unittests",
+        "test_id_prefix": "ninja://url:url_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--stop-ui",
+          "--gtest_filter=\"VaapiTest.*\""
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "vaapi_unittest BRYA_RELEASE_LKGM",
+        "test": "vaapi_unittest",
+        "test_id_prefix": "ninja://media/gpu/vaapi:vaapi_unittest/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
       }
     ]
   },
diff --git a/testing/buildbot/internal.chromeos.fyi.json b/testing/buildbot/internal.chromeos.fyi.json
index 8c721e2..995e082 100644
--- a/testing/buildbot/internal.chromeos.fyi.json
+++ b/testing/buildbot/internal.chromeos.fyi.json
@@ -1115,6 +1115,19 @@
     ],
     "skylab_tests": [
       {
+        "args": [
+          "--ozone-platform=headless"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "aura_unittests BRYA_RELEASE_LKGM",
+        "test": "aura_unittests",
+        "test_id_prefix": "ninja://ui/aura:aura_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
         "autotest_name": "chromium",
         "cros_board": "brya",
         "dut_pool": "chrome",
@@ -1125,6 +1138,30 @@
         "variant_id": "BRYA_RELEASE_LKGM"
       },
       {
+        "args": [
+          "--test-launcher-jobs=1",
+          "--gtest_filter=-*UsingRealWebcam_CaptureMjpeg*"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "capture_unittests BRYA_RELEASE_LKGM",
+        "test": "capture_unittests",
+        "test_id_prefix": "ninja://media/capture:capture_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "cc_unittests BRYA_RELEASE_LKGM",
+        "test": "cc_unittests",
+        "test_id_prefix": "ninja://cc:cc_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
         "autotest_name": "tast.chrome-from-gcs",
         "cros_board": "brya",
         "dut_pool": "chrome",
@@ -1179,6 +1216,233 @@
         "test_id_prefix": "ninja://chrome/test:chromeos_integration_tests/",
         "use_lkgm": true,
         "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "crypto_unittests BRYA_RELEASE_LKGM",
+        "test": "crypto_unittests",
+        "test_id_prefix": "ninja://crypto:crypto_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "display_unittests BRYA_RELEASE_LKGM",
+        "test": "display_unittests",
+        "test_id_prefix": "ninja://ui/display:display_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--env-var",
+          "LIBVA_DRIVERS_PATH",
+          "./",
+          "--env-var",
+          "LIBVA_DRIVER_NAME",
+          "libfake"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "experiment_percentage": 100,
+        "name": "fake_libva_driver_unittest BRYA_RELEASE_LKGM",
+        "test": "fake_libva_driver_unittest",
+        "test_id_prefix": "ninja://media/gpu/vaapi/test/fake_libva_driver:fake_libva_driver_unittest/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "google_apis_unittests BRYA_RELEASE_LKGM",
+        "test": "google_apis_unittests",
+        "test_id_prefix": "ninja://google_apis:google_apis_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "ipc_tests BRYA_RELEASE_LKGM",
+        "test": "ipc_tests",
+        "test_id_prefix": "ninja://ipc:ipc_tests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "latency_unittests BRYA_RELEASE_LKGM",
+        "test": "latency_unittests",
+        "test_id_prefix": "ninja://ui/latency:latency_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "libcups_unittests BRYA_RELEASE_LKGM",
+        "test": "libcups_unittests",
+        "test_id_prefix": "ninja://chrome/services/cups_proxy:libcups_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.media_unittests.filter"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "media_unittests BRYA_RELEASE_LKGM",
+        "test": "media_unittests",
+        "test_id_prefix": "ninja://media:media_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "midi_unittests BRYA_RELEASE_LKGM",
+        "test": "midi_unittests",
+        "test_id_prefix": "ninja://media/midi:midi_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "mojo_unittests BRYA_RELEASE_LKGM",
+        "test": "mojo_unittests",
+        "test_id_prefix": "ninja://mojo:mojo_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--vpython-dir=../../vpython_dir_linux_amd64",
+          "--gtest_filter=-PythonUtils.PythonRunTime"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "net_unittests BRYA_RELEASE_LKGM",
+        "test": "net_unittests",
+        "test_id_prefix": "ninja://net:net_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--stop-ui"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "ozone_gl_unittests BRYA_RELEASE_LKGM",
+        "test": "ozone_gl_unittests",
+        "test_id_prefix": "ninja://ui/ozone/gl:ozone_gl_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "ozone_unittests BRYA_RELEASE_LKGM",
+        "test": "ozone_unittests",
+        "test_id_prefix": "ninja://ui/ozone:ozone_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "pdf_unittests BRYA_RELEASE_LKGM",
+        "test": "pdf_unittests",
+        "test_id_prefix": "ninja://pdf:pdf_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "printing_unittests BRYA_RELEASE_LKGM",
+        "test": "printing_unittests",
+        "test_id_prefix": "ninja://printing:printing_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--stop-ui",
+          "--test-launcher-jobs=1"
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "profile_provider_unittest BRYA_RELEASE_LKGM",
+        "test": "profile_provider_unittest",
+        "test_id_prefix": "ninja://chrome/browser/metrics/perf:profile_provider_unittest/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "rust_gtest_interop_unittests BRYA_RELEASE_LKGM",
+        "test": "rust_gtest_interop_unittests",
+        "test_id_prefix": "ninja://testing/rust_gtest_interop:rust_gtest_interop_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "sql_unittests BRYA_RELEASE_LKGM",
+        "test": "sql_unittests",
+        "test_id_prefix": "ninja://sql:sql_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "url_unittests BRYA_RELEASE_LKGM",
+        "test": "url_unittests",
+        "test_id_prefix": "ninja://url:url_unittests/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
+      },
+      {
+        "args": [
+          "--stop-ui",
+          "--gtest_filter=\"VaapiTest.*\""
+        ],
+        "autotest_name": "chromium",
+        "cros_board": "brya",
+        "dut_pool": "chrome",
+        "name": "vaapi_unittest BRYA_RELEASE_LKGM",
+        "test": "vaapi_unittest",
+        "test_id_prefix": "ninja://media/gpu/vaapi:vaapi_unittest/",
+        "use_lkgm": true,
+        "variant_id": "BRYA_RELEASE_LKGM"
       }
     ]
   },
diff --git a/testing/buildbot/mixins.pyl b/testing/buildbot/mixins.pyl
index 6172e77..db5e69cc 100644
--- a/testing/buildbot/mixins.pyl
+++ b/testing/buildbot/mixins.pyl
@@ -1132,10 +1132,14 @@
       },
     },
   },
-  'vaapi_unittest_libfake_args': {
+  'vaapi_unittest_args': {
     'args': [
       '--stop-ui',
       '--gtest_filter="VaapiTest.*"',
+    ],
+  },
+  'vaapi_unittest_libfake_args': {
+    'args': [
       '--env-var',
       'LIBVA_DRIVERS_PATH',
       './',
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 2387635..b2802f8 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -702,13 +702,25 @@
       'rust_gtest_interop_unittests': {},
       'sql_unittests': {},
       'url_unittests': {},
+    },
+
+    'chromeos_vaapi_fakelib_gtests': {
       'vaapi_unittest': {
         'mixins': [
+          'vaapi_unittest_args',
           'vaapi_unittest_libfake_args',
         ],
       },
     },
 
+    'chromeos_vaapi_gtests': {
+      'vaapi_unittest': {
+        'mixins': [
+          'vaapi_unittest_args',
+        ],
+      },
+    },
+
     'chromium_android_scripts': {
       'check_network_annotations': {
         'script': 'check_network_annotations.py',
@@ -4233,6 +4245,7 @@
       'ozone_unittests': {},
       'vaapi_unittest': {
         'mixins': [
+          'vaapi_unittest_args',
           'vaapi_unittest_libfake_args',
         ],
       },
@@ -5872,6 +5885,7 @@
     'chromeos_vm_gtests': [
       'chromeos_integration_tests',
       'chromeos_system_friendly_gtests',
+      'chromeos_vaapi_fakelib_gtests',
     ],
 
     'chromeos_vm_gtests_and_tast': [
@@ -5879,6 +5893,7 @@
       'chromeos_browser_integration_tests',
       'chromeos_integration_tests',
       'chromeos_system_friendly_gtests',
+      'chromeos_vaapi_fakelib_gtests',
     ],
 
     'chromeos_vm_tast': [
@@ -6796,12 +6811,17 @@
           'CROS_BRYA_RELEASE_ASH_LKGM',
         ],
       },
-      'chromeos_device_only_gtests': {
+      'chromeos_integration_tests': {
         'variants': [
           'CROS_BRYA_RELEASE_ASH_LKGM',
         ],
       },
-      'chromeos_integration_tests': {
+      'chromeos_system_friendly_gtests': {
+        'variants': [
+          'CROS_BRYA_RELEASE_ASH_LKGM',
+        ],
+      },
+      'chromeos_vaapi_gtests': {
         'variants': [
           'CROS_BRYA_RELEASE_ASH_LKGM',
         ],