Sync chrome source in parallel

Sync chrome source in parallel

We add the --force flag to gclient sync to make it cope with a race condition.
The main chrome tree has some stuff checked in under src/third_party/<stuff>
On Chrome OS, we have a special dep that checks out from a git repo to
src/third_party/cros

When doing gclient sync --jobs N, with N>1, the latter will complete before
the former, meaning that svn will complain that an unversioned directory exists
at src/third_party.

The --force ignores this.

BUG=8859
TEST=emerge chrome with SERVER_SOURCE

Change-Id: Ie69d0b040fb8f7b1830b6875bca56c6775489672

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=ced29a8

[anush, 2010-11-16 01:12:39]

LGTM with nit. Please remove the gold change.

As agreed on prior email/IM lets start with --jobs=8 and tune up/down
as necessary.

On Mon, Nov 15, 2010 at 4:36 PM,  <cmasone@chromium.org> wrote:
> Reviewers: anush,
>
> Description:
> Sync chrome source in parallel
>
> We add the --force flag to gclient sync to make it cope with a race
> condition.
> The main chrome tree has some stuff checked in under src/third_party/<stuff>
> On Chrome OS, we have a special dep that checks out from a git repo to
> src/third_party/cros
>
> When doing gclient sync --jobs N, with N>1, the latter will complete before
> the former, meaning that svn will complain that an unversioned directory
> exists
> at src/third_party.
>
> The --force ignores this.
>
> BUG=8859
> TEST=emerge chrome with SERVER_SOURCE
>
> Change-Id: Ie69d0b040fb8f7b1830b6875bca56c6775489672
>
> Please review this at http://codereview.chromium.org/5009005/
>
> SVN Base: ssh://git@gitrw.chromium.org:9222/chromiumos-overlay.git@master
>
> Affected files:
>  M chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
>
>
> Index: chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
> diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
> b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
> index
>
5eba325762889748dd9ed0f096e85d9ba0c20001..bce05b9951bead57d0f9a0e117c8e1646a0d2965
> 100755
> --- a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
> +++ b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
> @@ -23,7 +23,6 @@ inherit eutils multilib toolchain-funcs flag-o-matic
> autotest
>  DESCRIPTION="Open-source version of Google Chrome web browser"
>  HOMEPAGE="http://chromium.org/"
>  SRC_URI=""
> -EGCLIENT_REPO_URI="WE USE A GCLIENT TEMPLATE FILE IN THIS DIRECTORY"
>
>  if [ "$PV" = "9999" ]; then
>        KEYWORDS="~x86 ~arm"
> @@ -300,7 +299,9 @@ src_unpack() {
>                        die "Cannot chdir to ${ECHROME_STORE_DIR}"
>
>                elog "Syncing google chrome sources using ${EGCLIENT}"
> -               ${EGCLIENT} sync --nohooks --delete_unversioned_trees \
> +               # We use --force to work around a race condition with
> +               # checking out cros.git in parallel with the main chrome
> tree.
> +               ${EGCLIENT} sync --jobs 8 --nohooks
> --delete_unversioned_trees --force \
>                        || die "${EGCLIENT} sync failed"
>
>                elog "set the LOCAL_SOURCE to  ${ECHROME_STORE_DIR}"
> @@ -416,7 +417,7 @@ src_compile() {
>        if use x86 && use gold; then
>                # List all gold binutils and pick the latest
>                GOLDLOC=$(
> -       echo /usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/binutils-bin/*-gold
> | \
> +       echo
> /usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/binutils-bin/*/*-gold | \
>        tail -n 1)
>
>                # GOLDLOC will either be the latest gold version or string
> with *
>
>
>