chromeos_config: Remove Lakitu configs and builds
Remove references to Lakitu from config generation and avoid generation
even if in GE config file. This will remove all Lakitu builds going
forward.
BUG=b:180437658
TEST=`run_tests`
Change-Id: I69767c2d42c7a9bee6eeb80109ffaaea63bf9a9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2699647
Reviewed-by: Dhanya Ganesh <dhanyaganesh@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Commit-Queue: Mike Nichols <mikenichols@chromium.org>
Tested-by: Mike Nichols <mikenichols@chromium.org>
diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index 7534ca5..90a0f94 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -248,14 +248,6 @@
)
site_config.AddTemplate(
- 'lakitu',
- sync_chrome=False,
- chrome_sdk=False,
- dev_installer_prebuilts=False,
- paygen_skip_testing=True,
- )
-
- site_config.AddTemplate(
'lassen',
sync_chrome=False,
chrome_sdk=False,
@@ -323,34 +315,6 @@
rootfs_verification=False,
)
- # An anchor of Laktiu' test customizations.
- # TODO: renable SIMPLE_AU_TEST_TYPE once b/67510964 is fixed.
- site_config.AddTemplate(
- 'lakitu_test_customizations',
- vm_tests=[config_lib.VMTestConfig(constants.VM_SUITE_TEST_TYPE,
- test_suite='smoke')],
- vm_tests_override=None,
- gce_tests=[config_lib.GCETestConfig(constants.GCE_SUITE_TEST_TYPE,
- test_suite='gce-sanity'),
- config_lib.GCETestConfig(constants.GCE_SUITE_TEST_TYPE,
- test_suite='gce-smoke')],
- )
-
- # Test customizations for lakitu boards' paladin builders.
- site_config.AddTemplate(
- 'lakitu_paladin_test_customizations',
- vm_tests=[config_lib.VMTestConfig(constants.VM_SUITE_TEST_TYPE,
- test_suite='smoke')],
- vm_tests_override=None,
- gce_tests=[config_lib.GCETestConfig(constants.GCE_SUITE_TEST_TYPE,
- test_suite='gce-sanity')],
- )
-
- # An anchor of Laktiu' notification email settings.
- site_config.AddTemplate(
- 'lakitu_notification_emails',
- )
-
site_config.AddTemplate(
'beaglebone',
site_config.templates.brillo,
@@ -765,8 +729,6 @@
if board in chromeos_boards.brillo_boards:
board_config.apply(site_config.templates.brillo)
- if board in chromeos_boards.lakitu_boards:
- board_config.apply(site_config.templates.lakitu)
if board in chromeos_boards.lassen_boards:
board_config.apply(site_config.templates.lassen)
if board in ['x30evb']:
@@ -1450,9 +1412,7 @@
# Move the following builders to active_builders once they are consistently
# green.
- unstable_builders = _frozen_ge_set(ge_build_config, [
- 'lakitu', # TODO: Re-enable after crbug.com/919630 resolved.
- ])
+ unstable_builders = _frozen_ge_set(ge_build_config, [])
external_board_configs = CreateBoardConfigs(
site_config, boards_dict, ge_build_config)
@@ -1563,18 +1523,6 @@
)
)
- master_config.AddSlave(
- site_config.Add(
- 'lakitu-incremental',
- site_config.templates.incremental,
- site_config.templates.internal_incremental,
- site_config.templates.incremental_affinity,
- site_config.templates.lakitu_notification_emails,
- board_configs['lakitu'],
- manifest_version=True,
- )
- )
-
#
# Available, but not regularly scheduled.
#
@@ -1998,9 +1946,6 @@
unified_board_names = set([b[config_lib.CONFIG_TEMPLATE_REFERENCE_BOARD_NAME]
for b in unified_builds])
- def _IsLakituConfig(config):
- return 'lakitu' in config['name']
-
def _CreateMasterConfig(name,
template=site_config.templates.release,
schedule=' 0 2,10,18 * * *'):
@@ -2024,8 +1969,6 @@
'master-release-basic',
template=site_config.templates.release_basic,
schedule='30 */2 * * * *')
- # pylint: disable=unused-variable
- lakitu_master_config = _CreateMasterConfig('master-lakitu-release')
def _AssignToMaster(config):
"""Add |config| as a slave config to the appropriate master config."""
@@ -2036,15 +1979,6 @@
if config.name.endswith('-release-basic'):
master = basic_master_config
- # Add this config to 'master-lakitu-release' instead if this is an LTS
- # branch for lakitu. This is typically only done on a branch after it is
- # out of ChromeOS support window.
- # To do this, set 'lakitu_lts_branch' to 'True' and re-run
- # 'config/refresh_generated_files'.
- lakitu_lts_branch = False
- if lakitu_lts_branch and _IsLakituConfig(config):
- master = lakitu_master_config
-
master.AddSlave(config)
### Release configs.
@@ -2057,7 +1991,6 @@
'grunt-kernelnext',
'hana-kernelnext',
'hatch-kernelnext',
- 'lakitu',
'volteer-kernelnext',
'zork-kernelnext',
])
@@ -2511,15 +2444,6 @@
'paygen_skip_testing': True,
},
- 'lakitu-release': config_lib.BuildConfig().apply(
- site_config.templates.lakitu_notification_emails,
- sign_types=['base'],
- ),
-
- # This is the full build of open-source overlay.
- 'lakitu-full': config_lib.BuildConfig().apply(
- site_config.templates.lakitu_notification_emails,
- ),
# TODO(yshaul): find out if hwqual needs to go as well
# TODO(yshaul): fix apply method to merge base and test
@@ -2758,17 +2682,8 @@
# Some boards in toolchain builder are not using the same configuration as
# release builders. Configure it here since it's easier, for both
# llvm-toolchain and llvm-next-toolchain builders.
- for board in ['lakitu', 'fizz-moblab', 'gale', 'mistral', 'whirlwind']:
- if board == 'lakitu':
- overwritten_configs[board+'-llvm-toolchain'] = {
- 'vm_tests': [config_lib.VMTestConfig(constants.VM_SUITE_TEST_TYPE,
- test_suite='smoke')],
- 'gce_tests': [config_lib.GCETestConfig(constants.GCE_SUITE_TEST_TYPE,
- test_suite='gce-sanity'),
- config_lib.GCETestConfig(constants.GCE_SUITE_TEST_TYPE,
- test_suite='gce-smoke')]
- }
- elif board == 'fizz-moblab':
+ for board in ['fizz-moblab', 'gale', 'mistral', 'whirlwind']:
+ if board == 'fizz-moblab':
overwritten_configs[board+'-llvm-toolchain'] = {
'enable_skylab_hw_tests': False,
'hw_tests': [
@@ -3179,22 +3094,6 @@
# Add non release branch schedules here, if needed.
# <branch>, <build_config>, <display_label>, <schedule>, <triggers>,
# <builder>
-
- # NOTE: R69, R73, R77 and R81 are Long Term Support (LTS) milestones for
- # lakitu and they'd like to keep them a little longer. Please let
- # lakitu-dev@google.com know before deleting this.
- ('release-R69-10895.B', 'master-lakitu-release',
- config_lib.DISPLAY_LABEL_RELEASE, '0 4 * * *', None,
- config_lib.LUCI_BUILDER_LEGACY_RELEASE),
- ('release-R73-11647.B', 'master-lakitu-release',
- config_lib.DISPLAY_LABEL_RELEASE, '0 8 * * *', None,
- config_lib.LUCI_BUILDER_LEGACY_RELEASE),
- ('release-R77-12371.B', 'master-lakitu-release',
- config_lib.DISPLAY_LABEL_RELEASE, '0 12 * * *', None,
- config_lib.LUCI_BUILDER_LEGACY_RELEASE),
- ('release-R81-12871.B', 'master-lakitu-release',
- config_lib.DISPLAY_LABEL_RELEASE, '0 16 * * *', None,
- config_lib.LUCI_BUILDER_LEGACY_RELEASE),
]
# The three active release branches.
diff --git a/config/chromeos_config_boards.py b/config/chromeos_config_boards.py
index d2960d4..7831348 100644
--- a/config/chromeos_config_boards.py
+++ b/config/chromeos_config_boards.py
@@ -55,7 +55,6 @@
'guado_labstation',
'guybrush',
'jecht',
- 'lakitu',
'majolica',
'mancomb',
'monroe',
@@ -93,10 +92,6 @@
'wristpin',
])
-lakitu_boards = frozenset([
- 'lakitu',
-])
-
lassen_boards = frozenset([
'lassen',
])
@@ -140,7 +135,7 @@
])
nofactory_boards = (
- lakitu_boards | termina_boards | lassen_boards | reven_boards | frozenset([
+ termina_boards | lassen_boards | reven_boards | frozenset([
'x30evb',
])
)
@@ -149,14 +144,14 @@
'x32-generic',
])
-noimagetest_boards = (lakitu_boards | loonix_boards | termina_boards
+noimagetest_boards = (loonix_boards | termina_boards
| scribe_boards | wshwos_boards | dustbuster_boards)
-nohwqual_boards = (lakitu_boards | lassen_boards | loonix_boards
+nohwqual_boards = (lassen_boards | loonix_boards
| termina_boards | beaglebone_boards | wshwos_boards
| dustbuster_boards | reven_boards)
-base_layout_boards = lakitu_boards | termina_boards
+base_layout_boards = termina_boards
builder_incompatible_binaries_boards = frozenset([
'grunt',
diff --git a/config/chromeos_test_config.py b/config/chromeos_test_config.py
index 84dcacd..a18a42b 100644
--- a/config/chromeos_test_config.py
+++ b/config/chromeos_test_config.py
@@ -13,7 +13,6 @@
from chromite.lib import constants
from chromite.lib import cros_logging as logging
-from chromite.config import chromeos_config_boards as config_boards
vmtest_boards = frozenset([
# Full VMTest support on ChromeOS is currently limited to devices derived
@@ -24,7 +23,7 @@
'betty-arc-r', # Like betty but R version of ARC++.
'novato', # Like betty but with GMSCore but not the Play Store
'novato-arc64', # 64 bit x86_64 ARC++ ABI
-]) | config_boards.lakitu_boards # All lakitu boards have VM support.
+])
def getInfoVMTest():
@@ -331,17 +330,6 @@
"""
overwritten_configs = {
- 'lakitu-release': config_lib.BuildConfig().apply(
- site_config.templates.lakitu_test_customizations,
- ),
-
- # This is the full build of open-source overlay.
- 'lakitu-full': config_lib.BuildConfig().apply(
- # logging_CrashSender is expected to fail for lakitu-full.
- # See b/111567339 for more details.
- useflags=config_lib.append_useflags(['-tests_logging_CrashSender']),
- ),
-
'guado_labstation-release': {
'hw_tests': [],
# 'hwqual':False,
@@ -400,10 +388,6 @@
vm_tests_override=getInfoVMTest(),
)
- site_config['lakitu-incremental'].apply(
- site_config.templates.lakitu_test_customizations,
- )
-
site_config['x32-generic-incremental'].apply(
site_config.templates.no_vmtest_builder,
)
@@ -512,12 +496,6 @@
)
# END Firmware
- # BEGIN Lakitu
- site_config.templates.lakitu.apply(
- site_config.templates.no_hwtest_builder,
- )
- # END Lakitu
-
# BEGIN Loonix
site_config.templates.loonix.apply(
site_config.templates.no_vmtest_builder,
diff --git a/config/config_dump.json b/config/config_dump.json
index 3df1de7..f55e956 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -22651,339 +22651,6 @@
"chrome_internal"
]
},
- "lakitu-full": {
- "_template": "full",
- "boards": [
- "lakitu"
- ],
- "chrome_sdk": false,
- "disk_layout": "base",
- "factory": false,
- "factory_install_netboot": false,
- "factory_toolkit": false,
- "hw_tests_override": [],
- "image_test": false,
- "images": [
- "base",
- "recovery",
- "test"
- ],
- "important": false,
- "manifest_branch": "main",
- "manifest_version": true,
- "paygen_skip_testing": true,
- "prebuilts": "public",
- "run_cpeexport": true,
- "sync_chrome": false,
- "useflags": [
- "-chrome_internal",
- "-tests_logging_CrashSender"
- ]
- },
- "lakitu-full-tryjob": {
- "_template": "full",
- "boards": [
- "lakitu"
- ],
- "chrome_sdk": false,
- "debug": true,
- "disk_layout": "base",
- "display_label": "tryjob",
- "factory": false,
- "factory_install_netboot": false,
- "factory_toolkit": false,
- "hw_tests_override": null,
- "image_test": false,
- "images": [
- "base",
- "recovery",
- "test"
- ],
- "luci_builder": "Try",
- "manifest_branch": "main",
- "manifest_version": true,
- "paygen_skip_testing": true,
- "prebuilts": "public",
- "run_cpeexport": true,
- "sync_chrome": false,
- "useflags": [
- "-chrome_internal",
- "-tests_logging_CrashSender"
- ]
- },
- "lakitu-incremental": {
- "_template": "incremental",
- "boards": [
- "lakitu"
- ],
- "build_affinity": true,
- "description": "Incremental Builds (internal)",
- "disk_layout": "base",
- "factory": false,
- "factory_install_netboot": false,
- "factory_toolkit": false,
- "gce_tests": [
- "{\n \"test_suite\": \"gce-sanity\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}",
- "{\n \"test_suite\": \"gce-smoke\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}"
- ],
- "hw_tests_override": [],
- "internal": true,
- "manifest": "official.xml",
- "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
- "manifest_version": true,
- "overlays": "both",
- "paygen_skip_testing": true,
- "sync_chrome": false,
- "useflags": [
- "chrome_internal"
- ],
- "vm_tests": [
- "{\n \"max_retries\": 5,\n \"retry\": false,\n \"test_suite\": \"smoke\",\n \"test_type\": \"vm_suite\",\n \"timeout\": 5400,\n \"use_ctest\": true,\n \"warn_only\": false\n}"
- ]
- },
- "lakitu-incremental-tryjob": {
- "_template": "incremental",
- "boards": [
- "lakitu"
- ],
- "chroot_replace": true,
- "debug": true,
- "description": "Incremental Builds (internal)",
- "disk_layout": "base",
- "display_label": "tryjob",
- "factory": false,
- "factory_install_netboot": false,
- "factory_toolkit": false,
- "gce_tests": [
- "{\n \"test_suite\": \"gce-sanity\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}",
- "{\n \"test_suite\": \"gce-smoke\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}"
- ],
- "hw_tests_override": null,
- "internal": true,
- "luci_builder": "Try",
- "manifest": "official.xml",
- "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
- "manifest_version": true,
- "overlays": "both",
- "paygen_skip_testing": true,
- "sync_chrome": false,
- "uprev": true,
- "useflags": [
- "chrome_internal"
- ],
- "vm_tests": [
- "{\n \"max_retries\": 5,\n \"retry\": false,\n \"test_suite\": \"smoke\",\n \"test_type\": \"vm_suite\",\n \"timeout\": 5400,\n \"use_ctest\": true,\n \"warn_only\": false\n}"
- ]
- },
- "lakitu-llvm-next-toolchain": {
- "_template": "llvm_next_toolchain",
- "boards": [
- "lakitu"
- ],
- "chrome_sdk": false,
- "disk_layout": "base",
- "factory": false,
- "factory_install_netboot": false,
- "factory_toolkit": false,
- "gce_tests": [
- "{\n \"test_suite\": \"gce-sanity\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}",
- "{\n \"test_suite\": \"gce-smoke\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}"
- ],
- "hw_tests": [],
- "hw_tests_override": [],
- "image_test": false,
- "paygen_skip_testing": true,
- "sync_chrome": false,
- "vm_tests": [
- "{\n \"max_retries\": 5,\n \"retry\": false,\n \"test_suite\": \"smoke\",\n \"test_type\": \"vm_suite\",\n \"timeout\": 5400,\n \"use_ctest\": true,\n \"warn_only\": false\n}"
- ]
- },
- "lakitu-llvm-next-toolchain-tryjob": {
- "_template": "llvm_next_toolchain",
- "boards": [
- "lakitu"
- ],
- "chrome_sdk": false,
- "debug": true,
- "disk_layout": "base",
- "display_label": "tryjob",
- "factory": false,
- "factory_install_netboot": false,
- "factory_toolkit": false,
- "gce_tests": [
- "{\n \"test_suite\": \"gce-sanity\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}",
- "{\n \"test_suite\": \"gce-smoke\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}"
- ],
- "hw_tests": [],
- "hw_tests_override": null,
- "image_test": false,
- "luci_builder": "Try",
- "paygen_skip_testing": true,
- "sync_chrome": false,
- "vm_tests": [
- "{\n \"max_retries\": 5,\n \"retry\": false,\n \"test_suite\": \"smoke\",\n \"test_type\": \"vm_suite\",\n \"timeout\": 5400,\n \"use_ctest\": true,\n \"warn_only\": false\n}"
- ]
- },
- "lakitu-llvm-toolchain": {
- "_template": "llvm_toolchain",
- "boards": [
- "lakitu"
- ],
- "chrome_sdk": false,
- "disk_layout": "base",
- "factory": false,
- "factory_install_netboot": false,
- "factory_toolkit": false,
- "gce_tests": [
- "{\n \"test_suite\": \"gce-sanity\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}",
- "{\n \"test_suite\": \"gce-smoke\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}"
- ],
- "hw_tests": [],
- "hw_tests_override": [],
- "image_test": false,
- "paygen_skip_testing": true,
- "sync_chrome": false,
- "vm_tests": [
- "{\n \"max_retries\": 5,\n \"retry\": false,\n \"test_suite\": \"smoke\",\n \"test_type\": \"vm_suite\",\n \"timeout\": 5400,\n \"use_ctest\": true,\n \"warn_only\": false\n}"
- ]
- },
- "lakitu-llvm-toolchain-tryjob": {
- "_template": "llvm_toolchain",
- "boards": [
- "lakitu"
- ],
- "chrome_sdk": false,
- "debug": true,
- "disk_layout": "base",
- "display_label": "tryjob",
- "factory": false,
- "factory_install_netboot": false,
- "factory_toolkit": false,
- "gce_tests": [
- "{\n \"test_suite\": \"gce-sanity\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}",
- "{\n \"test_suite\": \"gce-smoke\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}"
- ],
- "hw_tests": [],
- "hw_tests_override": null,
- "image_test": false,
- "luci_builder": "Try",
- "paygen_skip_testing": true,
- "sync_chrome": false,
- "vm_tests": [
- "{\n \"max_retries\": 5,\n \"retry\": false,\n \"test_suite\": \"smoke\",\n \"test_type\": \"vm_suite\",\n \"timeout\": 5400,\n \"use_ctest\": true,\n \"warn_only\": false\n}"
- ]
- },
- "lakitu-payloads": {
- "_template": "payloads",
- "boards": [
- "lakitu"
- ]
- },
- "lakitu-payloads-tryjob": {
- "_template": "payloads",
- "boards": [
- "lakitu"
- ],
- "debug": true,
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "lakitu-release": {
- "_template": "release",
- "boards": [
- "lakitu"
- ],
- "chrome_sdk": false,
- "dev_installer_prebuilts": false,
- "disk_layout": "base",
- "factory": false,
- "factory_install_netboot": false,
- "factory_toolkit": false,
- "gce_tests": [
- "{\n \"test_suite\": \"gce-sanity\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}",
- "{\n \"test_suite\": \"gce-smoke\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}"
- ],
- "hw_tests": [],
- "hw_tests_override": [],
- "hwqual": false,
- "image_test": false,
- "images": [
- "base",
- "recovery",
- "test"
- ],
- "important": false,
- "paygen_skip_testing": true,
- "sign_types": [
- "base"
- ],
- "sync_chrome": false,
- "vm_tests": [
- "{\n \"max_retries\": 5,\n \"retry\": false,\n \"test_suite\": \"smoke\",\n \"test_type\": \"vm_suite\",\n \"timeout\": 5400,\n \"use_ctest\": true,\n \"warn_only\": false\n}"
- ],
- "vm_tests_override": null
- },
- "lakitu-release-tryjob": {
- "_template": "release",
- "boards": [
- "lakitu"
- ],
- "chrome_sdk": false,
- "debug": true,
- "dev_installer_prebuilts": false,
- "disk_layout": "base",
- "display_label": "tryjob",
- "factory": false,
- "factory_install_netboot": false,
- "factory_toolkit": false,
- "gce_tests": [
- "{\n \"test_suite\": \"gce-sanity\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}",
- "{\n \"test_suite\": \"gce-smoke\",\n \"test_type\": \"gce_suite\",\n \"timeout\": 3600,\n \"use_ctest\": true\n}"
- ],
- "hw_tests": [],
- "hw_tests_override": null,
- "hwqual": false,
- "image_test": false,
- "images": [
- "base",
- "recovery",
- "test"
- ],
- "luci_builder": "Try",
- "paygen": false,
- "paygen_skip_testing": true,
- "push_image": false,
- "sign_types": [
- "base"
- ],
- "suite_scheduling": false,
- "sync_chrome": false,
- "vm_tests": [
- "{\n \"max_retries\": 5,\n \"retry\": false,\n \"test_suite\": \"smoke\",\n \"test_type\": \"vm_suite\",\n \"timeout\": 5400,\n \"use_ctest\": true,\n \"warn_only\": false\n}"
- ],
- "vm_tests_override": null
- },
- "lakitu-unittest-stress": {
- "_template": "unittest_stress",
- "boards": [
- "lakitu"
- ],
- "disk_layout": "base",
- "factory": false,
- "factory_install_netboot": false,
- "factory_toolkit": false,
- "hw_tests_override": null,
- "internal": true,
- "luci_builder": "Try",
- "manifest": "official.xml",
- "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
- "overlays": "both",
- "paygen_skip_testing": true,
- "sync_chrome": false,
- "useflags": [
- "chrome_internal"
- ]
- },
"lars-factory-glados-7828.B-factorybranch": {
"_template": "factorybranch",
"boards": [
@@ -24332,7 +23999,6 @@
"hana-full",
"kevin-full",
"kevin64-full",
- "lakitu-full",
"tael-full",
"tatl-full"
],
@@ -24370,7 +24036,6 @@
"hana-full-tryjob",
"kevin-full-tryjob",
"kevin64-full-tryjob",
- "lakitu-full-tryjob",
"tael-full-tryjob",
"tatl-full-tryjob"
],
@@ -24391,8 +24056,7 @@
"slave_configs": [
"amd64-generic-incremental",
"betty-incremental",
- "chell-incremental",
- "lakitu-incremental"
+ "chell-incremental"
]
},
"master-incremental-tryjob": {
@@ -24422,46 +24086,10 @@
"slave_configs": [
"amd64-generic-incremental-tryjob",
"betty-incremental-tryjob",
- "chell-incremental-tryjob",
- "lakitu-incremental-tryjob"
+ "chell-incremental-tryjob"
],
"uprev": true
},
- "master-lakitu-release": {
- "_template": "release",
- "boards": [],
- "chrome_sdk": false,
- "master": true,
- "schedule": " 0 2,10,18 * * *",
- "slave_configs": [],
- "sync_chrome": true
- },
- "master-lakitu-release-tryjob": {
- "_template": "release",
- "boards": [],
- "chrome_sdk": false,
- "debug": true,
- "debug_cidb": true,
- "display_label": "tryjob",
- "hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-arc\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-informational\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-installer\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-perbuild\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
- ],
- "hw_tests_override": null,
- "luci_builder": "Try",
- "master": true,
- "paygen": false,
- "push_image": false,
- "slave_configs": [],
- "suite_scheduling": false,
- "sync_chrome": true,
- "vm_tests_override": null
- },
"master-pi-android-pfq": {
"_template": "pi_android_pfq",
"boards": [],
@@ -24622,7 +24250,6 @@
"kukui-arc-r-release",
"kukui-arc64-release",
"kukui-release",
- "lakitu-release",
"lars-release",
"lasilla-ground-release",
"lulu-release",
@@ -24851,7 +24478,6 @@
"kukui-arc-r-release-tryjob",
"kukui-arc64-release-tryjob",
"kukui-release-tryjob",
- "lakitu-release-tryjob",
"lars-release-tryjob",
"lasilla-ground-release-tryjob",
"lulu-release-tryjob",
diff --git a/config/luci-scheduler.cfg b/config/luci-scheduler.cfg
index 86f93a8..8b1650c 100644
--- a/config/luci-scheduler.cfg
+++ b/config/luci-scheduler.cfg
@@ -2679,25 +2679,6 @@
}
job {
- id: "master-lakitu-release"
- realm: "cbb-jobs"
- acl_sets: "default"
- schedule: " 0 2,10,18 * * *"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:master"
- tags: "cbb_config:master-lakitu-release"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:master"
- properties: "cbb_config:master-lakitu-release"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
id: "master-pi-android-pfq"
realm: "cbb-jobs"
acl_sets: "default"
@@ -2793,82 +2774,6 @@
}
job {
- id: "release-R69-10895.B-master-lakitu-release"
- realm: "cbb-jobs"
- acl_sets: "default"
- schedule: "0 4 * * *"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R69-10895.B"
- tags: "cbb_config:master-lakitu-release"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R69-10895.B"
- properties: "cbb_config:master-lakitu-release"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
- id: "release-R73-11647.B-master-lakitu-release"
- realm: "cbb-jobs"
- acl_sets: "default"
- schedule: "0 8 * * *"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R73-11647.B"
- tags: "cbb_config:master-lakitu-release"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R73-11647.B"
- properties: "cbb_config:master-lakitu-release"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
- id: "release-R77-12371.B-master-lakitu-release"
- realm: "cbb-jobs"
- acl_sets: "default"
- schedule: "0 12 * * *"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R77-12371.B"
- tags: "cbb_config:master-lakitu-release"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R77-12371.B"
- properties: "cbb_config:master-lakitu-release"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
- id: "release-R81-12871.B-master-lakitu-release"
- realm: "cbb-jobs"
- acl_sets: "default"
- schedule: "0 16 * * *"
- buildbucket: {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.chromeos.general"
- builder: "LegacyRelease"
- tags: "cbb_branch:release-R81-12871.B"
- tags: "cbb_config:master-lakitu-release"
- tags: "cbb_display_label:release"
- properties: "cbb_branch:release-R81-12871.B"
- properties: "cbb_config:master-lakitu-release"
- properties: "cbb_display_label:release"
- properties: "cbb_extra_args:[\"--buildbot\"]"
- }
-}
-
-job {
id: "release-R89-13729.B-master-release"
realm: "cbb-jobs"
acl_sets: "default"
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index 95e4fee..602bd03 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -215,7 +215,6 @@
hana-full
kevin-full
kevin64-full
- lakitu-full
tael-full
tatl-full
@@ -224,7 +223,6 @@
amd64-generic-incremental
betty-incremental
chell-incremental
- lakitu-incremental
== informational ==
amd64-generic-asan
@@ -246,7 +244,6 @@
reef-pi-android-pfq
== release ==
- master-lakitu-release
master-release
ambassador-release
amd64-generic-cheets-release
@@ -351,7 +348,6 @@
kukui-arc-r-release
kukui-arc64-release
kukui-release
- lakitu-release
lars-release
lasilla-ground-release
lulu-release
@@ -1409,13 +1405,6 @@
kukui-payloads-tryjob
kukui-release-tryjob
kukui-unittest-stress
- lakitu-full-tryjob
- lakitu-incremental-tryjob
- lakitu-llvm-next-toolchain-tryjob
- lakitu-llvm-toolchain-tryjob
- lakitu-payloads-tryjob
- lakitu-release-tryjob
- lakitu-unittest-stress
lars-factory-glados-7828.B-factorybranch-tryjob
lars-full-tryjob
lars-llvm-next-toolchain-tryjob
@@ -1478,15 +1467,12 @@
hana-full-tryjob
kevin-full-tryjob
kevin64-full-tryjob
- lakitu-full-tryjob
tael-full-tryjob
tatl-full-tryjob
master-incremental-tryjob
amd64-generic-incremental-tryjob
betty-incremental-tryjob
chell-incremental-tryjob
- lakitu-incremental-tryjob
- master-lakitu-release-tryjob
master-pi-android-pfq-tryjob
betty-pi-arc-pi-android-pfq-tryjob
caroline-pi-android-pfq-tryjob
@@ -1604,7 +1590,6 @@
kukui-arc-r-release-tryjob
kukui-arc64-release-tryjob
kukui-release-tryjob
- lakitu-release-tryjob
lars-release-tryjob
lasilla-ground-release-tryjob
lulu-release-tryjob
diff --git a/cros/test/usergroup_baseline.py b/cros/test/usergroup_baseline.py
index f708213..1da237e 100644
--- a/cros/test/usergroup_baseline.py
+++ b/cros/test/usergroup_baseline.py
@@ -66,10 +66,6 @@
))
USER_BOARD_BASELINES = {
- 'lakitu': USER_BASELINE_LAKITU,
- 'lakitu-gpu': USER_BASELINE_LAKITU,
- 'lakitu-st': USER_BASELINE_LAKITU,
- 'lakitu_next': USER_BASELINE_LAKITU,
'arkham': USER_BASELINE_JETSTREAM,
'cyclone': USER_BASELINE_JETSTREAM,
'gale': USER_BASELINE_JETSTREAM,
@@ -258,10 +254,6 @@
))
GROUP_BOARD_BASELINES = {
- 'lakitu': GROUP_BASELINE_LAKITU,
- 'lakitu-gpu': GROUP_BASELINE_LAKITU,
- 'lakitu-st': GROUP_BASELINE_LAKITU,
- 'lakitu_next': GROUP_BASELINE_LAKITU,
'arkham': GROUP_BASELINE_JETSTREAM,
'cyclone': GROUP_BASELINE_JETSTREAM,
'gale': GROUP_BASELINE_JETSTREAM,
diff --git a/lib/config_lib.py b/lib/config_lib.py
index 48b427a..721b11d 100644
--- a/lib/config_lib.py
+++ b/lib/config_lib.py
@@ -101,6 +101,8 @@
LUCI_BUILDER_TRY,
}
+GOLDENEYE_IGNORED_BOARDS = ['lakitu']
+
def isTryjobConfig(build_config):
"""Is a given build config a tryjob config, or a production config?
@@ -1817,6 +1819,10 @@
for b in board_list:
name = b[CONFIG_TEMPLATE_NAME]
+ # Until Lakitu is removed from GE, skip the board
+ # http://b/180437658
+ if name in GOLDENEYE_IGNORED_BOARDS:
+ continue
# Invalid build configs being written out with no config templates,
# thus the default. See https://crbug.com/1012278.
for config in b.get(CONFIG_TEMPLATE_CONFIGS, []):
@@ -1848,6 +1854,10 @@
builder_to_boards_dict = {}
for b in board_list:
+ # Until Lakitu is removed from GE, skip the board
+ # http://b/180437658
+ if b['name'] in GOLDENEYE_IGNORED_BOARDS:
+ continue
# Invalid build configs being written out with no configs array, thus the
# default. See https://crbug.com/1005803.
for config in b.get(CONFIG_TEMPLATE_CONFIGS, []):
