scripts: chromite: Use base board SDK name for compressed ash
This is a hack to avoid setting release builders for SDKs. This will be
re-evaluated if we decide to move on with the feature.
BUG=b:247397013
TEST=cros chrome-sdk ...
TEST=chrome_deploy ...
Change-Id: I11098daa18613e05d6c51dde58c5e051341f62d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3944249
Tested-by: Daniil Lunev <dlunev@chromium.org>
Commit-Queue: Daniil Lunev <dlunev@chromium.org>
Reviewed-by: Sergey Frolov <sfrolov@google.com>
diff --git a/scripts/deploy_chrome.py b/scripts/deploy_chrome.py
index 1c30a97..f84aa58 100644
--- a/scripts/deploy_chrome.py
+++ b/scripts/deploy_chrome.py
@@ -82,6 +82,7 @@
RAW_ASH_FILE = "chrome"
COMPRESSED_ASH_PATH = os.path.join(_CHROME_DIR, COMPRESSED_ASH_FILE)
RAW_ASH_PATH = os.path.join(_CHROME_DIR, RAW_ASH_FILE)
+COMPRESSED_ASH_OVERLAY_SUFFIX = "-compressed-ash"
LACROS_DIR = "/usr/local/lacros-chrome"
_CONF_FILE = "/etc/chrome_dev.conf"
@@ -1242,9 +1243,17 @@
if options.compressed_ash:
# Setup SDK here so mksquashfs is still found in no-shell + nostrip
# configuration.
+ # HACH(b/247397013, dlunev): to not setup release builders for SDK while
+ # this is in test, cut the known suffix of experimental overlays.
+ sdk_orig_board = options.board
+ if sdk_orig_board.endswith(COMPRESSED_ASH_OVERLAY_SUFFIX):
+ sdk_orig_board = sdk_orig_board[
+ : -len(COMPRESSED_ASH_OVERLAY_SUFFIX)
+ ]
+
sdk = cros_chrome_sdk.SDKFetcher(
options.cache_dir,
- options.board,
+ sdk_orig_board,
use_external_config=options.use_external_config,
)
with sdk.Prepare(