From 444382a8e6164925565146e0102e282d3421a3bd Mon Sep 17 00:00:00 2001 From: Denis Nikitin Date: Mon, 16 May 2022 12:30:45 -0700 Subject: crosperf: Remove .cros dependency and add snappy to remotes Clean up code which handles ".cros" suffix. Crosfleet, ssh and cros shell don't require .cros suffix in remotes. Snappy device is back. Add it to lab machines checks. BUG=b:231402615 TEST=tested locally Change-Id: I6e9a308428de05b8e84891933bdc19c55e18d08e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3651281 Commit-Queue: Denis Nikitin Reviewed-by: Manoj Gupta Tested-by: Denis Nikitin --- lock_machine.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lock_machine.py') diff --git a/lock_machine.py b/lock_machine.py index 8bc3ec22..b95678e8 100755 --- a/lock_machine.py +++ b/lock_machine.py @@ -15,11 +15,10 @@ import getpass import os import sys -import file_lock_machine - from cros_utils import command_executer from cros_utils import logger from cros_utils import machines +import file_lock_machine class LockException(Exception): @@ -407,8 +406,8 @@ class LockManager(object): if os.path.exists(self.CROSFLEET_CREDENTIAL): credential = '-service-account-json %s' % self.CROSFLEET_CREDENTIAL cmd = (('%s dut lease -minutes %s %s %s %s') % - (self.CROSFLEET_PATH, self.LEASE_MINS, credential, '-host' - if '.cros' in machine else '-board', machine.rstrip('.cros'))) + (self.CROSFLEET_PATH, self.LEASE_MINS, credential, '-host', + machine.rstrip('.cros'))) # Wait 8 minutes for server to start the lease task, if not started, # we will treat it as unavailable. check_interval_time = 480 -- cgit v1.2.3