DroneX: Disable DevModeVerifier and remove instances of pools_dev_mode_allowed
Bug=b:277924148
Testing:go/fleetland satlab
Change-Id: Ic2a94acb7da84da90a1f27652fb8c8d296edb92e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/autotest-drone/+/4570964
Reviewed-by: Otabek Kasimov <otabek@google.com>
Tested-by: Nick Macdisi <macdisi@google.com>
Commit-Queue: Otabek Kasimov <otabek@google.com>
Auto-Submit: Nick Macdisi <macdisi@google.com>
diff --git a/server/hosts/cros_repair.py b/server/hosts/cros_repair.py
index 945f445..31135fd 100644
--- a/server/hosts/cros_repair.py
+++ b/server/hosts/cros_repair.py
@@ -51,18 +51,6 @@
'power',
)
-
-# _DEV_MODE_ALLOW_POOLS - The set of pools that are allowed to be
-# in dev mode (usually, those should be unmanaged devices)
-#
-_DEV_MODE_ALLOWED_POOLS = set(
- global_config.global_config.get_config_value(
- 'CROS',
- 'pools_dev_mode_allowed',
- type=str,
- default='',
- allow_blank=True).split(','))
-
# Setting to suppress dev mode check; primarily used for moblab where all
# DUT's are in dev mode.
_DEV_MODE_ALWAYS_ALLOWED = global_config.global_config.get_config_value(
@@ -463,7 +451,7 @@
# Some pools are allowed to be in dev mode
info = host.host_info_store.get()
if (_DEV_MODE_ALWAYS_ALLOWED or
- bool(info.pools & _DEV_MODE_ALLOWED_POOLS)):
+ bool(info.pools)):
return
result = host.run('crossystem devsw_boot', ignore_status=True).stdout
@@ -1566,7 +1554,7 @@
(repair_utils.SshVerifier, 'ssh', ('ping', )),
(ServoUSBDriveVerifier, 'usb_drive', ()),
(DevDefaultBootVerifier, 'dev_default_boot', ('ssh', )),
- (DevModeVerifier, 'devmode', ('ssh', )),
+ # (DevModeVerifier, 'devmode', ('ssh', )),
(EnrollmentStateVerifier, 'enrollment_state', ('ssh', )),
(HWIDVerifier, 'hwid', ('ssh', )),
(ACPowerVerifier, 'power', ('ssh', )),
@@ -1635,10 +1623,10 @@
)),
(DevDefaultBootRepair, 'set_default_boot', ('ssh', ),
('dev_default_boot', )),
- (CrosRebootRepair, 'reboot', ('ssh', ), (
- 'devmode',
- 'writable',
- )),
+ # (CrosRebootRepair, 'reboot', ('ssh', ), (
+ # 'devmode',
+ # 'writable',
+ # )),
(EnrollmentCleanupRepair, 'cleanup_enrollment', ('ssh', ),
('enrollment_state', )),
)
@@ -1722,10 +1710,10 @@
)),
(DevDefaultBootRepair, 'set_default_boot', ('ssh', ),
('dev_default_boot', )),
- (CrosRebootRepair, 'reboot', ('ssh', ), (
- 'devmode',
- 'writable',
- )),
+ # (CrosRebootRepair, 'reboot', ('ssh', ), (
+ # 'devmode',
+ # 'writable',
+ # )),
(EnrollmentCleanupRepair, 'cleanup_enrollment', ('ssh', ),
('enrollment_state', )),
(cros_firmware.GeneralFirmwareRepair, 'general_firmware',
diff --git a/server/hosts/cros_repair_unittest.py b/server/hosts/cros_repair_unittest.py
index 1527c26..313fdb2 100755
--- a/server/hosts/cros_repair_unittest.py
+++ b/server/hosts/cros_repair_unittest.py
@@ -21,7 +21,7 @@
(repair_utils.SshVerifier, 'ssh', ('ping', )),
(cros_repair.ServoUSBDriveVerifier, 'usb_drive', ()),
(cros_repair.DevDefaultBootVerifier, 'dev_default_boot', ('ssh', )),
- (cros_repair.DevModeVerifier, 'devmode', ('ssh', )),
+ # (cros_repair.DevModeVerifier, 'devmode', ('ssh', )),
(cros_repair.EnrollmentStateVerifier, 'enrollment_state', ('ssh', )),
(cros_repair.HWIDVerifier, 'hwid', ('ssh', )),
(cros_repair.ACPowerVerifier, 'power', ('ssh', )),
@@ -69,10 +69,10 @@
('ping', 'ssh', 'fwstatus', 'good_provision')),
(cros_repair.DevDefaultBootRepair, 'set_default_boot', ('ssh', ),
('dev_default_boot', )),
- (cros_repair.CrosRebootRepair, 'reboot', ('ssh', ), (
- 'devmode',
- 'writable',
- )),
+ # (cros_repair.CrosRebootRepair, 'reboot', ('ssh', ), (
+ # 'devmode',
+ # 'writable',
+ # )),
(cros_repair.EnrollmentCleanupRepair, 'cleanup_enrollment', ('ssh', ),
('enrollment_state', )),
(cros_firmware.GeneralFirmwareRepair, 'general_firmware',
@@ -118,7 +118,7 @@
(repair_utils.SshVerifier, 'ssh', ('ping', )),
(cros_repair.ServoUSBDriveVerifier, 'usb_drive', ()),
(cros_repair.DevDefaultBootVerifier, 'dev_default_boot', ('ssh', )),
- (cros_repair.DevModeVerifier, 'devmode', ('ssh', )),
+ # (cros_repair.DevModeVerifier, 'devmode', ('ssh', )),
(cros_repair.EnrollmentStateVerifier, 'enrollment_state', ('ssh', )),
(cros_repair.HWIDVerifier, 'hwid', ('ssh', )),
(cros_repair.ACPowerVerifier, 'power', ('ssh', )),
@@ -164,10 +164,10 @@
('ping', 'ssh', 'fwstatus', 'good_provision')),
(cros_repair.DevDefaultBootRepair, 'set_default_boot', ('ssh', ),
('dev_default_boot', )),
- (cros_repair.CrosRebootRepair, 'reboot', ('ssh', ), (
- 'devmode',
- 'writable',
- )),
+ # (cros_repair.CrosRebootRepair, 'reboot', ('ssh', ), (
+ # 'devmode',
+ # 'writable',
+ # )),
(cros_repair.EnrollmentCleanupRepair, 'cleanup_enrollment', ('ssh', ),
('enrollment_state', )),
(cros_repair.JetstreamTpmRepair, 'jetstream_tpm_repair',
