commit 55a630994278bbf5921cf2bdadfddec51c2ff638
author Manoj Gupta <manojgupta@google.com> Thu Jun 13 11:47:13 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Jun 20 17:29:01 2019 +0000
tree 7657c353f50aea69f23fc7bf807ba0e03859af87
parent bb1cead37565bbe9a923b6a7904dc5ab4ba8002a

chromite: Remove the code related to self-bootstrap.

Cleanup all code referring to self-bootstrap
now that chromiumos-sdk is using a previously built SDK
by treating self-bootstrap as the default for bootstrapping.

BUG=chromium:861924
TEST=chromite unit tests pass.

Change-Id: Iaa1d00ba1332df1eb117bcb371505f9bcd36f3b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1658519
Tested-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Evan Hernandez <evanhernandez@chromium.org>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index ac1393f..b4abbd4 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -94,13 +94,6 @@
   ]
 
 
-def GetStage3Urls(version):
-  return [
-      toolchain.GetSdkURL(suburl='stage3-amd64-%s.tar.%s' % (version, ext))
-      for ext in COMPRESSION_PREFERENCE
-  ]
-
-
 def FetchRemoteTarballs(storage_dir, urls, desc, allow_none=False):
   """Fetches a tarball given by url, and place it in |storage_dir|.
 
@@ -725,12 +718,6 @@
       help='Use sdk tarball located at this url. Use file:// '
       'for local files.')
   parser.add_argument(
-      '--self-bootstrap',
-      dest='self_bootstrap',
-      action='store_true',
-      default=False,
-      help=('Use previously build sdk for bootstrapping.'))
-  parser.add_argument(
       '--sdk-version',
       help=('Use this sdk version.  For prebuilt, current is %r'
             ', for bootstrapping it is %r.' % (sdk_latest_version,
@@ -862,8 +849,13 @@
       os.path.join(constants.SOURCE_ROOT, constants.SDK_VERSION_FILE),
       ignore_missing=True)
   sdk_latest_version = conf.get('SDK_LATEST_VERSION', '<unknown>')
-  bootstrap_latest_version = conf.get('BOOTSTRAP_LATEST_VERSION', '<unknown>')
   bootstrap_frozen_version = conf.get('BOOTSTRAP_FROZEN_VERSION', '<unknown>')
+
+  # Use latest SDK for bootstrapping if requested. Use a frozen version of SDK
+  # for bootstrapping if BOOTSTRAP_FROZEN_VERSION is set.
+  bootstrap_latest_version = (
+      sdk_latest_version
+      if bootstrap_frozen_version == '<unknown>' else bootstrap_frozen_version)
   parser, commands = _CreateParser(sdk_latest_version, bootstrap_latest_version)
   options = parser.parse_args(argv)
   chroot_command = options.commands
@@ -882,13 +874,6 @@
     _ReportMissing(osutils.FindMissingBinaries(PROXY_NEEDED_TOOLS))
   missing_image_tools = osutils.FindMissingBinaries(IMAGE_NEEDED_TOOLS)
 
-  # Use latest SDK for bootstrapping if requested. Use a frozen version of SDK
-  # for bootstrapping if BOOTSTRAP_FROZEN_VERSION is set.
-  if options.self_bootstrap:
-    bootstrap_latest_version = (
-        sdk_latest_version if bootstrap_frozen_version == '<unknown>' else
-        bootstrap_frozen_version)
-
   if (sdk_latest_version == '<unknown>' or
       bootstrap_latest_version == '<unknown>'):
     cros_build_lib.Die(
@@ -1112,10 +1097,6 @@
   if options.download:
     if options.sdk_url:
       urls = [options.sdk_url]
-    elif options.bootstrap:
-      urls = GetStage3Urls(sdk_version)
-      if options.self_bootstrap:
-        urls = GetArchStageTarballs(sdk_version)
     else:
       urls = GetArchStageTarballs(sdk_version)