build_stages: Do not unmount tree if cache mount
Do not unmount the tree if the build root is a source cache mount. This
is legacy code that is meant to work with local directories while source
cache mounts will be disk mounts.
This change consolidates past changes to allow for a smooth cherrypick to subsequent branches.
BUG=b:197678613
TEST='tryjob && local tryjob'
Change-Id: Id2b33abfee141e871d66c30da51e6d804bdec758
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3205726
Reviewed-by: Dhanya Ganesh <dhanyaganesh@chromium.org>
Commit-Queue: Mike Nichols <mikenichols@chromium.org>
Tested-by: Mike Nichols <mikenichols@chromium.org>
diff --git a/scripts/cbuildbot_launch.py b/scripts/cbuildbot_launch.py
index 788edad..5f64940 100644
--- a/scripts/cbuildbot_launch.py
+++ b/scripts/cbuildbot_launch.py
@@ -429,16 +429,14 @@
for i, arg in enumerate(argv):
if arg in ('-r', '--buildroot'):
argv[i + 1] = buildroot
- # Remove source_cache option if it has not been added to the branch.
- if constants.REEXEC_API_MINOR < 13:
- argv.remove('--source_cache')
- logging.info('Cbuildbot Args: %s', argv)
# Source_cache flag is only used to indicate a transition to cache disks
# and doesn't need to be passed back to Cbuildbot.
if '--source_cache' in argv:
argv.remove('--source_cache')
+ logging.info('Cbuildbot Args: %s', argv)
+
# This filters out command line arguments not supported by older versions
# of cbuildbot.
parser = cbuildbot.CreateParser()