[autotest] Quit mangling board names with a '-' in them.
This deletes legacy code from CrosHost.get_board() that stripped off
any suffix text from a board name after the first (or sometimes
second) '-' character. The code had outlived its purpose, and was
breaking names like amd64-generic and veyron_minnie-cheets.
BUG=chromium:570088
TEST=In a local instance, run `atest host create` for a veyron_minnie-cheets DUT
Change-Id: I1bb9ab703d0b373d078796a6bfa16ec58f2cf725
Reviewed-on: https://chromium-review.googlesource.com/326440
Reviewed-by: Dan Shi <dshi@google.com>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Tested-by: Gwendal Grignou <gwendal@chromium.org>
Commit-Queue: Richard Barnette <jrbarnette@chromium.org>
diff --git a/server/hosts/cros_host.py b/server/hosts/cros_host.py
index cf43bf8..0ea3421 100644
--- a/server/hosts/cros_host.py
+++ b/server/hosts/cros_host.py
@@ -2405,6 +2405,7 @@
version_string = self.run(client_constants.CHROME_VERSION_COMMAND).stdout
return utils.parse_chrome_version(version_string)
+
@label_decorator()
def get_board(self):
"""Determine the correct board label for this host.
@@ -2413,17 +2414,8 @@
"""
release_info = utils.parse_cmd_output('cat /etc/lsb-release',
run_method=self.run)
- board = release_info['CHROMEOS_RELEASE_BOARD']
- # Devices in the lab generally have the correct board name but our own
- # development devices have {board_name}-signed-{key_type}. The board
- # name may also begin with 'x86-' which we need to keep.
- board_format_string = ds_constants.BOARD_PREFIX + '%s'
- splitted_board = board.split('-')
- try:
- end = splitted_board.index('generic')
- except ValueError:
- end = 0
- return board_format_string % '-'.join(board.split('-')[0:end + 1])
+ return (ds_constants.BOARD_PREFIX +
+ release_info['CHROMEOS_RELEASE_BOARD'])
@label_decorator('lightsensor')
