build_stages: Do not remove build_root if overlayfs
Do not remove the build_root if the recipe is using overlayfs.
BUG=b:198442885
TEST='manual tryjob && led recipe'
Change-Id: Icb40973356b437c1d5e46d962a8200ce7c119b1d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3145855
Reviewed-by: Dhanya Ganesh <dhanyaganesh@chromium.org>
Reviewed-by: George Engelbrecht <engeg@google.com>
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 aa3f8db..788edad 100644
--- a/scripts/cbuildbot_launch.py
+++ b/scripts/cbuildbot_launch.py
@@ -429,6 +429,10 @@
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.