Revert "Use lkgm file for Lacros public builders"
This reverts commit 680ffd20544ed36a11d9bc2c15046f617491551a.
Reason for revert: Broke dawn roll
BUG=331775413
Original change's description:
> Use lkgm file for Lacros public builders
>
> Use lkgm version from //chromeos/CHROMEOS_LKGM instead of
> the buildbot config.
>
> Change-Id: Iece7ed466cad621eee91e10e6293c8c409f3f724
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5384923
> Commit-Queue: Sven Zheng <svenzheng@chromium.org>
> Reviewed-by: Kuan Huang <kuanhuang@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1278672}
Change-Id: Ibf7b361022b3af9bc94fbb41f19902d0b99033fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5407354
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Sven Zheng <svenzheng@chromium.org>
Commit-Queue: Sven Zheng <svenzheng@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1280206}
diff --git a/infra/config/generated/testing/variants.pyl b/infra/config/generated/testing/variants.pyl
index 2c43eb35..4607c44 100644
--- a/infra/config/generated/testing/variants.pyl
+++ b/infra/config/generated/testing/variants.pyl
@@ -172,7 +172,7 @@
'identifier': 'TROGDOR_PUBLIC_LKGM',
'skylab': {
'cros_board': 'trogdor',
- 'use_lkgm': True,
+ 'cros_img': 'trogdor-public/R125-15826.0.0',
'bucket': 'chromiumos-image-archive',
},
},
@@ -181,7 +181,7 @@
'skylab': {
'cros_board': 'volteer',
'cros_model': 'voxel',
- 'use_lkgm': True,
+ 'cros_img': 'volteer-public/R125-15826.0.0',
'bucket': 'chromiumos-image-archive',
'dut_pool': 'chromium',
'public_builder': 'cros_test_platform_public',
diff --git a/infra/config/targets/cros-skylab-variants.json b/infra/config/targets/cros-skylab-variants.json
index f6839e1..9386aee 100644
--- a/infra/config/targets/cros-skylab-variants.json
+++ b/infra/config/targets/cros-skylab-variants.json
@@ -181,7 +181,8 @@
"CROS_TROGDOR_PUBLIC_LKGM": {
"skylab": {
"cros_board": "trogdor",
- "use_lkgm": true,
+ "cros_chrome_version": "124.0.6366.0",
+ "cros_img": "trogdor-public/R125-15826.0.0",
"bucket": "chromiumos-image-archive"
},
"enabled": true,
@@ -199,7 +200,8 @@
"skylab": {
"cros_board": "volteer",
"cros_model": "voxel",
- "use_lkgm": true,
+ "cros_chrome_version": "124.0.6366.0",
+ "cros_img": "volteer-public/R125-15826.0.0",
"bucket": "chromiumos-image-archive",
"dut_pool": "chromium",
"public_builder": "cros_test_platform_public",
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 23013e31..b3160178 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -1372,6 +1372,7 @@
"bucket": "chromiumos-image-archive",
"ci_only": true,
"cros_board": "volteer",
+ "cros_img": "volteer-public/R125-15826.0.0",
"cros_model": "voxel",
"dut_pool": "chromium",
"name": "chromeos_integration_tests VOLTEER_PUBLIC_LKGM",
@@ -1379,7 +1380,6 @@
"public_builder_bucket": "testplatform-public",
"test": "chromeos_integration_tests",
"test_id_prefix": "ninja://chrome/test:chromeos_integration_tests/",
- "use_lkgm": true,
"variant_id": "VOLTEER_PUBLIC_LKGM"
}
]
@@ -1538,6 +1538,7 @@
"bucket": "chromiumos-image-archive",
"ci_only": true,
"cros_board": "volteer",
+ "cros_img": "volteer-public/R125-15826.0.0",
"cros_model": "voxel",
"dut_pool": "chromium",
"name": "lacros_all_tast_tests VOLTEER_PUBLIC_LKGM",
@@ -1553,7 +1554,6 @@
"test_id_prefix": "ninja://chromeos/lacros:lacros_all_tast_tests/",
"test_level_retries": 2,
"timeout_sec": 10800,
- "use_lkgm": true,
"variant_id": "VOLTEER_PUBLIC_LKGM"
}
]
@@ -1582,16 +1582,17 @@
"autotest_name": "chromium",
"bucket": "chromiumos-image-archive",
"cros_board": "trogdor",
+ "cros_img": "trogdor-public/R125-15826.0.0",
"name": "chromeos_integration_tests TROGDOR_PUBLIC_LKGM",
"test": "chromeos_integration_tests",
"test_id_prefix": "ninja://chrome/test:chromeos_integration_tests/",
- "use_lkgm": true,
"variant_id": "TROGDOR_PUBLIC_LKGM"
},
{
"autotest_name": "tast.lacros-from-gcs",
"bucket": "chromiumos-image-archive",
"cros_board": "trogdor",
+ "cros_img": "trogdor-public/R125-15826.0.0",
"name": "lacros_all_tast_tests TROGDOR_PUBLIC_LKGM",
"resultdb": {
"enable": true,
@@ -1603,7 +1604,6 @@
"test_id_prefix": "ninja://chromeos/lacros:lacros_all_tast_tests/",
"test_level_retries": 2,
"timeout_sec": 10800,
- "use_lkgm": true,
"variant_id": "TROGDOR_PUBLIC_LKGM"
}
]
diff --git a/testing/buildbot/tryserver.chromium.chromiumos.json b/testing/buildbot/tryserver.chromium.chromiumos.json
index 400bfbcd..264abfc 100644
--- a/testing/buildbot/tryserver.chromium.chromiumos.json
+++ b/testing/buildbot/tryserver.chromium.chromiumos.json
@@ -10,6 +10,7 @@
"autotest_name": "chromium",
"bucket": "chromiumos-image-archive",
"cros_board": "volteer",
+ "cros_img": "volteer-public/R125-15826.0.0",
"cros_model": "voxel",
"dut_pool": "chromium",
"name": "chromeos_integration_tests VOLTEER_PUBLIC_LKGM",
@@ -17,13 +18,13 @@
"public_builder_bucket": "testplatform-public",
"test": "chromeos_integration_tests",
"test_id_prefix": "ninja://chrome/test:chromeos_integration_tests/",
- "use_lkgm": true,
"variant_id": "VOLTEER_PUBLIC_LKGM"
},
{
"autotest_name": "tast.lacros-from-gcs",
"bucket": "chromiumos-image-archive",
"cros_board": "volteer",
+ "cros_img": "volteer-public/R125-15826.0.0",
"cros_model": "voxel",
"dut_pool": "chromium",
"name": "lacros_all_tast_tests VOLTEER_PUBLIC_LKGM",
@@ -39,7 +40,6 @@
"test_id_prefix": "ninja://chromeos/lacros:lacros_all_tast_tests/",
"test_level_retries": 2,
"timeout_sec": 10800,
- "use_lkgm": true,
"variant_id": "VOLTEER_PUBLIC_LKGM"
}
]
diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl
index 2c43eb35..4607c44 100644
--- a/testing/buildbot/variants.pyl
+++ b/testing/buildbot/variants.pyl
@@ -172,7 +172,7 @@
'identifier': 'TROGDOR_PUBLIC_LKGM',
'skylab': {
'cros_board': 'trogdor',
- 'use_lkgm': True,
+ 'cros_img': 'trogdor-public/R125-15826.0.0',
'bucket': 'chromiumos-image-archive',
},
},
@@ -181,7 +181,7 @@
'skylab': {
'cros_board': 'volteer',
'cros_model': 'voxel',
- 'use_lkgm': True,
+ 'cros_img': 'volteer-public/R125-15826.0.0',
'bucket': 'chromiumos-image-archive',
'dut_pool': 'chromium',
'public_builder': 'cros_test_platform_public',
