[go: nahoru, domu]

Run chromeos_integration_tests on more Ash skylab builders

This is a new target for ChromeOS testing.

BUG=b:305288786

Include-Ci-Only-Tests: true
Test: Tested on tryjob.
Change-Id: Ibeb2df87dbac6dfe81602184d9ca52b4edd57424
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5018437
Reviewed-by: Tatsuhisa Yamaguchi <yamaguchi@chromium.org>
Auto-Submit: Sven Zheng <svenzheng@google.com>
Commit-Queue: Sven Zheng <svenzheng@google.com>
Cr-Commit-Position: refs/heads/main@{#1223904}
diff --git a/infra/config/generated/testing/test_suites.pyl b/infra/config/generated/testing/test_suites.pyl
index 41cfe3d..e4825fc 100644
--- a/infra/config/generated/testing/test_suites.pyl
+++ b/infra/config/generated/testing/test_suites.pyl
@@ -6756,6 +6756,11 @@
           'CROS_JACUZZI_RELEASE_CHROME_FROM_TLS_ASH_LKGM',
         ],
       },
+      'chromeos_integration_tests': {
+        'variants': [
+          'CROS_JACUZZI_RELEASE_CHROME_FROM_TLS_ASH_LKGM',
+        ],
+      },
     },
 
     'chromeos_octopus_skylab_tests': {
@@ -6772,6 +6777,11 @@
           'CROS_TROGDOR_RELEASE_ASH_LKGM',
         ],
       },
+      'chromeos_integration_tests': {
+        'variants': [
+          'CROS_TROGDOR_RELEASE_ASH_LKGM',
+        ],
+      },
     },
 
     'chromeos_volteer_skylab_tests': {
@@ -6790,6 +6800,11 @@
           'CROS_VOLTEER_RELEASE_ASH_LKGM',
         ],
       },
+      'chromeos_integration_tests': {
+        'variants': [
+          'CROS_VOLTEER_RELEASE_ASH_LKGM',
+        ],
+      },
     },
 
     'fieldtrial_ios_simulator_tests': {
diff --git a/infra/config/targets/matrix_compound_suites.star b/infra/config/targets/matrix_compound_suites.star
index 0df6a09..e9d7f3d 100644
--- a/infra/config/targets/matrix_compound_suites.star
+++ b/infra/config/targets/matrix_compound_suites.star
@@ -173,6 +173,11 @@
                 "CROS_JACUZZI_RELEASE_CHROME_FROM_TLS_ASH_LKGM",
             ],
         ),
+        "chromeos_integration_tests": targets.legacy_matrix_config(
+            variants = [
+                "CROS_JACUZZI_RELEASE_CHROME_FROM_TLS_ASH_LKGM",
+            ],
+        ),
     },
 )
 
@@ -195,6 +200,11 @@
                 "CROS_TROGDOR_RELEASE_ASH_LKGM",
             ],
         ),
+        "chromeos_integration_tests": targets.legacy_matrix_config(
+            variants = [
+                "CROS_TROGDOR_RELEASE_ASH_LKGM",
+            ],
+        ),
     },
 )
 
@@ -216,6 +226,11 @@
                 "CROS_VOLTEER_RELEASE_ASH_LKGM",
             ],
         ),
+        "chromeos_integration_tests": targets.legacy_matrix_config(
+            variants = [
+                "CROS_VOLTEER_RELEASE_ASH_LKGM",
+            ],
+        ),
     },
 )
 
diff --git a/testing/buildbot/chrome.json b/testing/buildbot/chrome.json
index ce28aef..5a2ffb5 100644
--- a/testing/buildbot/chrome.json
+++ b/testing/buildbot/chrome.json
@@ -1451,6 +1451,15 @@
         "timeout_sec": 7200,
         "use_lkgm": true,
         "variant_id": "JACUZZI_RELEASE_CHROME_FROM_TLS_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "jacuzzi",
+        "name": "chromeos_integration_tests JACUZZI_RELEASE_CHROME_FROM_TLS_LKGM",
+        "test": "chromeos_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:chromeos_integration_tests/",
+        "use_lkgm": true,
+        "variant_id": "JACUZZI_RELEASE_CHROME_FROM_TLS_LKGM"
       }
     ]
   },
@@ -1616,6 +1625,15 @@
         "timeout_sec": 7200,
         "use_lkgm": true,
         "variant_id": "VOLTEER_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "volteer",
+        "name": "chromeos_integration_tests VOLTEER_RELEASE_LKGM",
+        "test": "chromeos_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:chromeos_integration_tests/",
+        "use_lkgm": true,
+        "variant_id": "VOLTEER_RELEASE_LKGM"
       }
     ]
   },
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 0c6cd9e..f201597 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -4595,6 +4595,15 @@
         "timeout_sec": 7200,
         "use_lkgm": true,
         "variant_id": "JACUZZI_RELEASE_CHROME_FROM_TLS_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "jacuzzi",
+        "name": "chromeos_integration_tests JACUZZI_RELEASE_CHROME_FROM_TLS_LKGM",
+        "test": "chromeos_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:chromeos_integration_tests/",
+        "use_lkgm": true,
+        "variant_id": "JACUZZI_RELEASE_CHROME_FROM_TLS_LKGM"
       }
     ]
   },
diff --git a/testing/buildbot/internal.chromeos.fyi.json b/testing/buildbot/internal.chromeos.fyi.json
index 703b165..14796d9 100644
--- a/testing/buildbot/internal.chromeos.fyi.json
+++ b/testing/buildbot/internal.chromeos.fyi.json
@@ -1226,6 +1226,15 @@
         "timeout_sec": 7200,
         "use_lkgm": true,
         "variant_id": "JACUZZI_RELEASE_CHROME_FROM_TLS_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "jacuzzi",
+        "name": "chromeos_integration_tests JACUZZI_RELEASE_CHROME_FROM_TLS_LKGM",
+        "test": "chromeos_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:chromeos_integration_tests/",
+        "use_lkgm": true,
+        "variant_id": "JACUZZI_RELEASE_CHROME_FROM_TLS_LKGM"
       }
     ]
   },
@@ -1272,6 +1281,15 @@
         "timeout_sec": 21600,
         "use_lkgm": true,
         "variant_id": "TROGDOR_RELEASE_LKGM"
+      },
+      {
+        "autotest_name": "chromium",
+        "cros_board": "trogdor",
+        "name": "chromeos_integration_tests TROGDOR_RELEASE_LKGM",
+        "test": "chromeos_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:chromeos_integration_tests/",
+        "use_lkgm": true,
+        "variant_id": "TROGDOR_RELEASE_LKGM"
       }
     ]
   },
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 41cfe3d..e4825fc 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -6756,6 +6756,11 @@
           'CROS_JACUZZI_RELEASE_CHROME_FROM_TLS_ASH_LKGM',
         ],
       },
+      'chromeos_integration_tests': {
+        'variants': [
+          'CROS_JACUZZI_RELEASE_CHROME_FROM_TLS_ASH_LKGM',
+        ],
+      },
     },
 
     'chromeos_octopus_skylab_tests': {
@@ -6772,6 +6777,11 @@
           'CROS_TROGDOR_RELEASE_ASH_LKGM',
         ],
       },
+      'chromeos_integration_tests': {
+        'variants': [
+          'CROS_TROGDOR_RELEASE_ASH_LKGM',
+        ],
+      },
     },
 
     'chromeos_volteer_skylab_tests': {
@@ -6790,6 +6800,11 @@
           'CROS_VOLTEER_RELEASE_ASH_LKGM',
         ],
       },
+      'chromeos_integration_tests': {
+        'variants': [
+          'CROS_VOLTEER_RELEASE_ASH_LKGM',
+        ],
+      },
     },
 
     'fieldtrial_ios_simulator_tests': {