commit 6038f61395018ef6a24edcb209419ee913ccf46b
author Sergey Frolov <sfrolov@google.com> Mon Jun 13 14:07:21 2022 -0600
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jun 23 01:53:13 2022 +0000
tree 7225117d20faffe39ced0089a309699e9e2e3251
parent 6c06047467f55c54f6bf98b4744ebc9d99c0de5b

chromite: add --skip-chroot-upgrade in cros_sdk

Adds support for
  cros_sdk --skip-chroot-upgrade

BUG=b:223623863
TEST=`cros_sdk --debug --skip-chroot-upgrade --replace --sdk-version 2022.05.09.125449` skips upgrade of chroot.

Change-Id: I25315f4ecb960b8da5cdbde8069637bde4733dfc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3703997
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Auto-Submit: Sergey Frolov <sfrolov@google.com>
Tested-by: Sergey Frolov <sfrolov@google.com>
Reviewed-by: Lizzy Presland <zland@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index c2de209..6cb82a0 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -702,6 +702,13 @@
       '--reproxy-cfg-file',
       type='path',
       help="Config file for re-client's reproxy used for remoteexec.")
+  parser.add_argument(
+      '--skip-chroot-upgrade',
+      dest='chroot_upgrade',
+      action='store_false',
+      default=True,
+      help='Skip automatic SDK and toolchain upgrade when entering the chroot. '
+           'Never guaranteed to work, especially as ToT moves forward.')
 
   # Use type=str instead of type='path' to prevent the given path from being
   # transfered to absolute path automatically.
@@ -1168,7 +1175,8 @@
             Path(options.chroot),
             Path(sdk_tarball),
             Path(options.cache_dir),
-            usepkg=not options.bootstrap and not options.nousepkg)
+            usepkg=not options.bootstrap and not options.nousepkg,
+            chroot_upgrade=options.chroot_upgrade)
         mounted = True
 
     if options.enter: