Commit Graph

56 Commits (903ee412bf14dc8cf93de065f7fab128f324aadf)

Author SHA1 Message Date
Ryan Tseng 4dc0b2a33d Bot Update: Always pass in --revision <solution>@unmanaged
Gclient sometimes ignores "unmanaged": "False" in the gclient solution
if --revision <anything> is passed.  This forces gclient to always
treat solutions deps as unmanaged.

BUG=693296

Change-Id: I91d5f4c9377fab0fde23cf15d1475779978820fa
Reviewed-on: https://chromium-review.googlesource.com/444098
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
8 years ago
Andrii Shyshkalov 58e31a8996 Revert "Revert "bot_update: speculative fix for gerrit patch application failure.""
This reverts commit 2074a4b78d.

Reason for revert: this is a reland, because it didn't actually break Angle.

Original change's description:
> Revert "bot_update: speculative fix for gerrit patch application failure."
> 
> This reverts commit 2b4da1228f.
> 
> Reason for revert: likely broke Angle http://crbug.com/692140
> 
> Original change's description:
> > bot_update: speculative fix for gerrit patch application failure.
> > 
> > bot_update doesn't properly cleanup git index state from unmerged paths,
> > which are likely if Rietveld patches were failed to be applied in prior
> > runs in the same checkout dir.
> > 
> > R=​machenbach@chromium.org
> > BUG=692067
> > 
> > Change-Id: I8fd326caefce8623731697a368cbad3159405257
> > Reviewed-on: https://chromium-review.googlesource.com/442426
> > Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
> > Reviewed-by: Michael Achenbach <machenbach@chromium.org>
> > 
> 
> TBR=machenbach@chromium.org,tandrii@chromium.org,chromium-reviews@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=692067,692140
> 
> Change-Id: Iec808f28f3a0af99914a279536bb20a8975e02ba
> Reviewed-on: https://chromium-review.googlesource.com/442485
> Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
> Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
> 

TBR=machenbach@chromium.org,tandrii@chromium.org,chromium-reviews@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=692067,692140

Change-Id: I4b4b66fa74f11e73e066602a9e7efabd5a29a974
Reviewed-on: https://chromium-review.googlesource.com/443345
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
8 years ago
Ryan Tseng 4dbec6722f bot_update: Rewrite repo@HEAD to repo@origin/master
BUG=692140,664880

Change-Id: I3ddd899f1841930e601a906d658c5c78e2d76673
Reviewed-on: https://chromium-review.googlesource.com/442707
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Ryan Tseng <hinoka@chromium.org>
8 years ago
Andrii Shyshkalov 2074a4b78d Revert "bot_update: speculative fix for gerrit patch application failure."
This reverts commit 2b4da1228f.

Reason for revert: likely broke Angle http://crbug.com/692140

Original change's description:
> bot_update: speculative fix for gerrit patch application failure.
> 
> bot_update doesn't properly cleanup git index state from unmerged paths,
> which are likely if Rietveld patches were failed to be applied in prior
> runs in the same checkout dir.
> 
> R=​machenbach@chromium.org
> BUG=692067
> 
> Change-Id: I8fd326caefce8623731697a368cbad3159405257
> Reviewed-on: https://chromium-review.googlesource.com/442426
> Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
> Reviewed-by: Michael Achenbach <machenbach@chromium.org>
> 

TBR=machenbach@chromium.org,tandrii@chromium.org,chromium-reviews@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=692067,692140

Change-Id: Iec808f28f3a0af99914a279536bb20a8975e02ba
Reviewed-on: https://chromium-review.googlesource.com/442485
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
8 years ago
Andrii Shyshkalov 2b4da1228f bot_update: speculative fix for gerrit patch application failure.
bot_update doesn't properly cleanup git index state from unmerged paths,
which are likely if Rietveld patches were failed to be applied in prior
runs in the same checkout dir.

R=machenbach@chromium.org
BUG=692067

Change-Id: I8fd326caefce8623731697a368cbad3159405257
Reviewed-on: https://chromium-review.googlesource.com/442426
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
8 years ago
Ryan Tseng 112edbbb15 Bot Update: Use gclient sync --revision for revisions
BUG=664880

Change-Id: Ic3d4da4595acb509c9dae682dbd696900f435436
Reviewed-on: https://chromium-review.googlesource.com/442025
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Ryan Tseng <hinoka@chromium.org>
8 years ago
Dan Jacques 260ab401aa Remote nested retries on checkout.
Remove nested retries on checkout. Since the outer loop handles retries
specially, we want to let it exclusively handle retries. This will
prevent the inner retry loop triggering a timeout condition (rather than
a failure condition) with the outer loop.

BUG=chromium:665116
TEST=None

Change-Id: I4bf0c08b75861bf1c95060452118c314a121f9f3
Reviewed-on: https://chromium-review.googlesource.com/411397
Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Commit-Queue: Ryan Tseng <hinoka@chromium.org>
9 years ago
dnj b445ef568c bot_update: Use 'gclient' from same repository.
Currently, 'bot_update' uses the 'gclient' that is on the system path.
Now, it will use the 'gclient.py' that is in the same 'depot_tools'
checkout as the 'bot_update' recipe module.

Also don't ignore "git_cache" move errors.

BUG=664254,663990,663440
TEST=None

Review-Url: https://codereview.chromium.org/2492963002
9 years ago
katthomas 86fe47d1a0 Make bot_update on win more resilient
Sometimes Windows has trouble deleting files. This can cause problems
when lockfiles are left in .git directories.

R=agable@google.com
BUG=659178

Review-Url: https://codereview.chromium.org/2454463002
9 years ago
katthomas b7c80888a6 Log error message if os.rename fails
R=agable@google.com
BUG=659178

Review-Url: https://codereview.chromium.org/2448983004
9 years ago
katthomas df66a34f68 Remove git lockfile flakiness on win (bot_update)
Hypothesis: Sometimes bot update fails because windows fails to delete
a lockfile associated with a git process.

Test: If this happens, let's delete that lockfile and try again.

BUG=651602

Review-Url: https://codereview.chromium.org/2382653005
9 years ago
hinoka b61b9b7583 Reland bot_update: add --auth-refresh-token-json passthrough for apply_issue
Reland of https://codereview.chromium.org/2294413002/ after a rebase fix.

BUG=642150

Review-Url: https://codereview.chromium.org/2353833002
9 years ago
hinoka ad842878e4 Revert of bot_update: add --auth-refresh-token-json passthrough for apply_issue (patchset #7 id:120001 of https://codereview.chromium.org/2294413002/ )
Reason for revert:
Pointing to the wrong file :(

Original issue's description:
> bot_update: add --auth-refresh-token-json passthrough for apply_issue
>
> BUG=642150
>
> Committed: e465667e78

TBR=vadimsh@chromium.org,martiniss@chromium.org,tandrii@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=642150

Review-Url: https://codereview.chromium.org/2350363003
9 years ago
hinoka e465667e78 bot_update: add --auth-refresh-token-json passthrough for apply_issue
BUG=642150

Review-Url: https://codereview.chromium.org/2294413002
9 years ago
vadimsh 6ac12ffd59 Make bot_update.py print git version it uses.
R=iannucci@chromium.org, dnj@chromium.org
BUG=647446

Review-Url: https://codereview.chromium.org/2344313002
9 years ago
vadimsh 18ca30ca80 Teach bot_update to remove partially deleted git repos.
Also add logging to 'remove', helps to debug issues with 'build.dead' filling
up with crap.

R=iannucci@chromium.org, hinoka@chromium.org
BUG=647046

Review-Url: https://codereview.chromium.org/2342973002
9 years ago
rmistry ea9e93f28c Skip apply_gerrit rebase when there is a rebase failure.
Not doing so causes a failure in the 'git checkout $base_rev' step as visible here: https://build.chromium.org/p/client.skia.fyi/builders/Infra-PerCommit-Trybot/builds/4995
This causes the checkout to remain in the "rebase in progress" state.

BUG=chromium:645955
BUG=skia:5749

Committed: 9736fe8938
Review-Url: https://codereview.chromium.org/2328313002
9 years ago
rmistry b940385856 Revert of Skip apply_gerrit rebase when there is a rebase failure (patchset #2 id:20001 of https://codereview.chromium.org/2328313002/ )
Reason for revert:
The "git rebase --abort" should only happen when there is a failure during rebase not when it succeeds.

Original issue's description:
> Skip apply_gerrit rebase when there is a rebase failure.
>
> Not doing so causes a failure in the 'git checkout $base_rev' step as visible here: https://build.chromium.org/p/client.skia.fyi/builders/Infra-PerCommit-Trybot/builds/4995
> This causes the checkout to remain in the "rebase in progress" state.
>
>
> BUG=chromium:645955
> BUG=skia:5749
>
> Committed: 9736fe8938

TBR=agable@chromium.org,andybons@chromium.org,tandrii@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:645955

Review-Url: https://codereview.chromium.org/2331103002
9 years ago
rmistry 9736fe8938 Skip apply_gerrit rebase when there is a rebase failure.
Not doing so causes a failure in the 'git checkout $base_rev' step as visible here: https://build.chromium.org/p/client.skia.fyi/builders/Infra-PerCommit-Trybot/builds/4995
This causes the checkout to remain in the "rebase in progress" state.

BUG=chromium:645955
BUG=skia:5749

Review-Url: https://codereview.chromium.org/2328313002
9 years ago
iannucci d1d31d5d41 A bunch more little cleanups in bot_update.
R=agable@chromium.org, estaab@chromium.org, hinoka@chromium.org, martiniss@chromium.org
BUG=643885

Review-Url: https://codereview.chromium.org/2321203003
9 years ago
agable c958da4979 Switch bot_update to use exponential backoff on clone
R=iannucci@chromium.org
BUG=472386

Review-Url: https://codereview.chromium.org/2324073002
9 years ago
iannucci 3dd7436899 Remove unused PATCH_TOOL and resulting dead code from bot_update.
R=agable@chromium.org, estaab@chromium.org, hinoka@chromium.org, martiniss@chromium.org
BUG=643885

Review-Url: https://codereview.chromium.org/2328883002
9 years ago
agable 3454ae85da Reland "Delete lots of svn logic from bot_update"
This is a reland of 082267a659
which was reverted in 4dcad385f4

BUG=472386

Review-Url: https://codereview.chromium.org/2325513002
9 years ago
iannucci 0abcd2640a Fix typobug in bot_update.py.
Extra comma changes type from dict to tuple :(

TBR=agable@chromium.org, estaab@chromium.org, hinoka@chromium.org, martiniss@chromium.org
BUG=643885
NOPRESUBMIT=true
NOTRY=true

Review-Url: https://codereview.chromium.org/2325763002
9 years ago
iannucci 16e7f097a7 Remove bogus master/builder/slave parameters from bot_update.
Bot update now always runs regardless of environmental context.

R=estaab@chromium.org, hinoka@chromium.org, martiniss@chromium.org, tandrii@chromium.org
BUG=643885

Review-Url: https://codereview.chromium.org/2308193002
9 years ago
bpastene 4dcad385f4 Revert of Delete lots of svn logic from bot_update (patchset #5 id:80001 of https://codereview.chromium.org/2280213002/ )
Reason for revert:
Everything's purple :(

Original issue's description:
> Delete lots of svn logic from bot_update
>
> R=hinoka@chromium.org
> BUG=472386
>
> Committed: 082267a659

TBR=hinoka@chromium.org,hinoka@google.com,iannucci@chromium.org,agable@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=472386

Review-Url: https://codereview.chromium.org/2320653003
9 years ago
agable 082267a659 Delete lots of svn logic from bot_update
R=hinoka@chromium.org
BUG=472386

Review-Url: https://codereview.chromium.org/2280213002
9 years ago
iannucci 045d107c23 Remove patch_url from bot_update.
R=hinoka@chromium.org, martiniss@chromium.org, tandrii@chromium.org
BUG=643885

Review-Url: https://codereview.chromium.org/2310113003
9 years ago
iannucci 95f3d317e4 Just disable force to ensure that bot_update really is running everywhere.
This makes it so that regardless of what force is set to in the recipe, if you
invoke bot_update.ensure_checkout, it will actually run.

Removal of the force option (and related options) to come shortly.

R=estaab@chromium.org, hinoka@chromium.org, martiniss@chromium.org, tandrii@chromium.org
BUG=643885

Review-Url: https://codereview.chromium.org/2311673002
9 years ago
tandrii 4cb6fb7fbd bot_update: don't forget to apply Gerrit patches for DEPS-ed in projects.
R=machenbach@chromium.org,andybons@chromium.org
BUG=602906
TEST=manual run of Angle recipe locally

Review-Url: https://codereview.chromium.org/2299693003
9 years ago
andybons 6911b06750 Make rebase and sync the default for Gerrit updates.
BUG=602906
R=tandrii@chromium.org

Recipe-Tryjob-Bypass-Reason: tandrii@ takes responsibility.
Review-Url: https://codereview.chromium.org/2298883002
9 years ago
hinoka 0b7cf885e0 Remove Deps2Git references from bot_update.py
BUG=

Review-Url: https://codereview.chromium.org/2283043002
9 years ago
rmistry 2250d5b3b0 Add apply_gerrit_ref to bot_update api.
BUG=skia:5627

Review-Url: https://codereview.chromium.org/2249983004
9 years ago
tandrii 0c561b329b Cleanup old debugging code.
TBR=phajdan.jr@chromium.org
BUG=537417

Review-Url: https://codereview.chromium.org/2242123003
9 years ago
Andrew Bonventre f83fa37b34 Add flag to rebase before gclient sync when applying a Gerrit patch
BUG=612417

Change-Id: I695bb93afd5ccde2c34b0dfc78989248e9b923e9
9 years ago
nodir b96f2d5b1d Revert of bot_update: fix git dir check (patchset #1 id:1 of https://codereview.chromium.org/2174923002/ )
Reason for revert:
this is wrong. if directory is not empty, git clone fails

Original issue's description:
> bot_update: fix git dir check
>
> existance of a dir does not mean it is a git repo. Check .git dir
> presence instead.
>
> This is the reason why swarmbucket build.git builds fail.
>
> TBR=hinoka@chromium.org
> BUG=
>
> Committed: cdac80c9fb

TBR=hinoka@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review-Url: https://codereview.chromium.org/2173683003
9 years ago
nodir cdac80c9fb bot_update: fix git dir check
existance of a dir does not mean it is a git repo. Check .git dir
presence instead.

This is the reason why swarmbucket build.git builds fail.

TBR=hinoka@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2174923002
9 years ago
smut ae7ea3167e Revert "Remove all safesync_url functionality from gclient"
This reverts commit 99a7f80578.
This reverts commit 2697cd19a7.
This reverts commit 8c51b6f148.
This reverts commit d4aedc811b.

Reason for revert:
Breaks iOS release branch builds.

BUG=623762
TBR=agable,maruel

Review URL: https://codereview.chromium.org/2162583004 .
9 years ago
phajdan.jr 426e4271da bot_update: add /chrome-internal/trunk/src-internal to RECOGNIZED_PATHS
The script already contains references to chrome-internal, and when running
under remote_run we have no access to hacky build_internal checkout.

BUG=593999, 584079

Review-Url: https://codereview.chromium.org/2101573002
9 years ago
agable 99a7f80578 Remove all safesync_url functionality from gclient
R=maruel@chromium.org
BUG=109184

Review-Url: https://codereview.chromium.org/2087313002
9 years ago
kjellander@chromium.org bf23eff330 Make WebRTC patches apply to Chromium checkouts on Windows.
The change in https://codereview.chromium.org/1982243002
didn't take into account that the script runs on the actual
bot OS, so Windows will have backslashes as dir separators.

BUG=438952

Review-Url: https://codereview.chromium.org/2021783003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300672 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
nodir@chromium.org 7ae58956f6 bot_update: remove activation check for non-masters
Cherry-pick https://codereview.chromium.org/2000403004/ to depot_tools's
bot_update.py

R=hinoka@chromium.org
BUG=613641

Review-Url: https://codereview.chromium.org/2022453003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300670 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
kjellander@chromium.org 71929a5f85 Use --extra_patchlevel for WebRTC patches on Chromium trybots.
The --extra_patchlevel flag was added in
https://codereview.chromium.org/1988583002/

In order to make it possible for WebRTC patches to apply in
src/third_party/webrtc of a Chromium checkout, one directory
level needs to be trimmed.

BUG=438952, 611808

Review-Url: https://codereview.chromium.org/1982243002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300618 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
phajdan.jr@chromium.org 116286a64a depot_tools: add debug logic to bot_update for gerrit patches
BUG=606150, 602906

Review-Url: https://codereview.chromium.org/1954083002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300466 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
tandrii@chromium.org a69d56c8ac Revert of bot_update: call gclient sync after checking out a gerrit ref (patchset #1 id:1 of https://codereview.chromium.org/1904663002/ )
Reason for revert:
I believe this is mostly likely to have broken Angle, but this is speculative.

http://crbug.com/606150

Original issue's description:
> bot_update: call gclient sync after checking out a gerrit ref
> 
> BUG=chromium:602906
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=300109

TBR=hinoka@chromium.org,yyanagisawa@chromium.org,hinoka@google.com,phajdan.jr@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=chromium:602906

Review URL: https://codereview.chromium.org/1918903003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300159 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
phajdan.jr@chromium.org 76a4900e2e bot_update: call gclient sync after checking out a gerrit ref
BUG=chromium:602906

Review URL: https://codereview.chromium.org/1904663002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300109 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
yyanagisawa@chromium.org a04cae9f58 Add --gerrit_no_reset for who need to use FETCH_HEAD revision.
Avoid to call git reset --soft to preserve current revision to
FETCH_HEAD.  'got_revision' property would also be that from
FETCH_HEAD.

BUG=596787

Review URL: https://codereview.chromium.org/1837453002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299721 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
machenbach@chromium.org 7fe25f4079 V8: Add new v8 master to bot_update.
BUG=485955
TBR=jochen@chromium.org

Review URL: https://codereview.chromium.org/1858193002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299695 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
hinoka@google.com 6eb23e25bd Revert of Bot update cleanup (patchset #5 id:80001 of https://codereview.chromium.org/1686273002/ )
Reason for revert:
Separating change into smaller changes.

Original issue's description:
> Bot update cleanup
> 
> * Remove activation check
> * Remove messages
> * Remove deps2git
> * Remove build_internal pointer by:
> ** Moving chrome svn url into bot_update.py (This isn't secret anyways.)
> ** Move patch.exe into depot_tools (No reason this should've been internal...)
> ** Default everything to active, so no need for checks anyways.
> 
> BUG=
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=298809

TBR=martiniss@chromium.org,eseidel@chromium.org,estaab@chromium.org,iannucci@chromium.org,hinoka@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=

Review URL: https://codereview.chromium.org/1706893003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298826 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
hinoka@chromium.org b0f36188b2 Bot update cleanup
* Remove activation check
* Remove messages
* Remove deps2git
* Remove build_internal pointer by:
** Moving chrome svn url into bot_update.py (This isn't secret anyways.)
** Move patch.exe into depot_tools (No reason this should've been internal...)
** Default everything to active, so no need for checks anyways.

BUG=

Review URL: https://codereview.chromium.org/1686273002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298809 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago