cbuildbot_launch: Intial sync merges existing changes. |
|||||
Issue descriptionThe initial sync in cbuildbot_launch may not produce "clean" checkouts in all cases. In this build the initial checkout is much slower than expected (8m instead of 1.5m). https://uberchromegw.corp.google.com/i/chromeos/builders/butterfly-paladin/builds/22185 Checking the logs, its attempting to do rebasing of local changes: https://luci-logdog.appspot.com/v/?s=chromeos%2Fbb%2Fchromeos%2Fbutterfly-paladin%2F22185%2F%2B%2Frecipes%2Fsteps%2FInitialCheckout%2F0%2Fstdout project src/platform2/ First, rewinding head to replay your work on top of it... Applying: metrics: Add vmlog logging to metrics_daemon. project src/third_party/chromiumos-overlay/ First, rewinding head to replay your work on top of it... Applying: Marking 9999 ebuild for brillo-base/libbrillobinder as stable. .git/rebase-apply/patch:1459: new blank line at EOF. + .git/rebase-apply/patch:1918: new blank line at EOF. + .git/rebase-apply/patch:4489: new blank line at EOF. + .git/rebase-apply/patch:9011: new blank line at EOF. + warning: 4 lines add whitespace errors. Using index info to reconstruct a base tree... When there are rebasing errors, it wipes local checkouts and refetches them. Auto-merging brillo-base/libbrillobinder/libbrillobinder-0.0.1-r1352.ebuild Patch failed at 0001 Marking 9999 ebuild for brillo-base/libbrillobinder as stable. The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort". real 0m23.670s 09:43:44: INFO: RunCommand: sudo -- rm -rf chrome_build chrome_release chromeos-admin chromite chromium cros-signing crostools docs infra infra_virtualenv manifest manifest-internal src in /b/cbuild/repository 09:45:03: INFO: RunCommand: repo --time sync --force-sync '--cache-dir=/b/cros_git_cache' -l in /b/cbuild/repository Checking out files: 20% (36/173)
,
Apr 28 2017
I guess our builds clean up the git repos before executing syncs, see the clean up stage: 08:41:51: INFO: Cleaning up buildroot git repositories.
,
Apr 28 2017
Interesting. I'm a bit surprised that we don't do detached checkouts, which I *think* would just fix this.
,
May 5 2017
,
May 11 2017
,
May 13 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/chromite/+/7649691aa907dcf7aa6ae2a2200b6cd24abe4d7b commit 7649691aa907dcf7aa6ae2a2200b6cd24abe4d7b Author: Don Garrett <dgarrett@google.com> Date: Sat May 13 03:58:00 2017 cbuildbot_launch: Cleanup repository before Syncing. Currently cbuildbot_launch's initial sync ends up rebasing on top of whatever happens to be in the buildroot before it starts up. That means that A) The intial codebase is corrupt (could have arbitrary CLs in it). B) If rebase fails, we recover in a very expensive way, timewise. BUG= chromium:716639 TEST=run_tests + local launch builds. Change-Id: I0b97e3b6d1f8ce9d3a9963d0f5900bb8982f7ef7 Reviewed-on: https://chromium-review.googlesource.com/503483 Commit-Ready: Don Garrett <dgarrett@chromium.org> Tested-by: Don Garrett <dgarrett@chromium.org> Reviewed-by: Ningning Xia <nxia@chromium.org> [modify] https://crrev.com/7649691aa907dcf7aa6ae2a2200b6cd24abe4d7b/scripts/cbuildbot_launch.py [modify] https://crrev.com/7649691aa907dcf7aa6ae2a2200b6cd24abe4d7b/scripts/cbuildbot_launch_unittest.py
,
Jun 27 2017
,
Jan 22 2018
|
|||||
►
Sign in to add a comment |
|||||
Comment 1 by dgarr...@chromium.org
, Apr 28 2017