Commit Graph

101 Commits (d343c63519c179f158c522f27f332e129d27a26c)

Author SHA1 Message Date
recipe-roller ce4ebd0746 Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


Please review the expectation changes, and LGTM as normal. The recipe roller
will *NOT* CQ the change itself, so you must CQ the change manually.


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/05a33f9dcf2289bbaf233fcae1e2fb508d95f528 Record infra_step in recipe expectations (phajdan.jr@chromium.org)

R=phajdan.jr@chromium.org

Change-Id: Ic1202d82b7bb4376976c1b4989cbbd7d26d7c531
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Reviewed-on: https://chromium-review.googlesource.com/454341
Commit-Queue: <recipe-roller@chromium.org>
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
8 years ago
Ryan Tseng a590f73bd2 Fix extra space in git env var
BUG=635641

Change-Id: I66f669ed45199107643fced174c0cd1b8eaa80ad
Reviewed-on: https://chromium-review.googlesource.com/444449
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Ryan Tseng <hinoka@chromium.org>
8 years ago
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
Ryan Tseng 0d21d19e03 Bot_update: kill git if it's too slow
BUG=635641

Change-Id: Ibfeda2ab32d10a8a4e229a428a846ce9809e8dcd
Reviewed-on: https://chromium-review.googlesource.com/444094
Reviewed-by: Daniel Jacques <dnj@chromium.org>
Commit-Queue: Ryan Tseng <hinoka@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
Paweł Hajdan, Jr 3c2e098bc0 Pass cwd via context rather than api.step kwargs
See https://groups.google.com/a/chromium.org/d/msg/infra-dev/p8Iq9v9Y4k0/w__b1zTWAQAJ
for more context.

BUG=685746

Change-Id: Iab46d78e92d67e9a2523cce8b22d9798a6121dd8
Reviewed-on: https://chromium-review.googlesource.com/439328
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@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
Quinten Yearsley 442fb64cab depot_tools: Run automatic spell-checker.
Specifically, this CL was made by running codespell
(https://github.com/lucasdemarchi/codespell), manually filtering
for changes in non-third-party files that appear correct.

Change-Id: Ia16c1b29483d777744450d7bea45a178cf877a25
Reviewed-on: https://chromium-review.googlesource.com/420871
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
8 years ago
Nodir Turakulov 7da798be10 infra_paths: do nothing if path_config is not specified
Currently if path_config is not specified, infra_paths
defaults to buildbot paths. We want to make this behavior explicit,
so we don't have to introduce a new "luci" path configuration which
tells infra_paths module to do nothing.

Buildbot now specifies path_config=buildbot since
https://chromium-review.googlesource.com/c/412029/ ,
so now we can remove this default.

This also affects all expectation files because this CL switches 
the default path configuration from Buildbot to LUCI.
In particular, it changes default git cache dir from [GIT_CACHE]
to [CACHE]/git.
Also code paths that work only in Buildbot environment has to 
have a test with path_config=buildbot.

R=iannucci@chromium.org, martiniss@chromium.org
BUG=662586

Change-Id: Ifeabe13e69810dd24a6deb4830699f8c9fafafae
Reviewed-on: https://chromium-review.googlesource.com/411989
Commit-Queue: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
9 years ago
Nodir Turakulov ff416a73fb deprecate build path
Update recipe modules that use path "build" to either check whether it
is defined or fail with an explanation if it is not defined.

This CL marks failure code paths as `# pragma: no cover`. This comment
will be removed in https://chromium-review.googlesource.com/c/411989/

R=iannucci@chromium.org, martiniss@chromium.org
BUG=662586

Change-Id: Ieb7637deefa6e366dfe4c30c7711d60daa06575a
Reviewed-on: https://chromium-review.googlesource.com/412225
Commit-Queue: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
9 years ago
Nodir Turakulov cb1beaa79f deprecate depot_tools path
Use depot_tools module's methods or package_repo_resource function to
determine paths of tools that live in depot_tools

R=iannucci@chromium.org, martiniss@chromium.org
BUG=662586

Change-Id: Ic3172308c140f7f19e982ec6ec5a4b1b83261e1b
Reviewed-on: https://chromium-review.googlesource.com/411936
Reviewed-by: Erik Staab <estaab@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Nodir Turakulov <nodir@chromium.org>
9 years ago
Nodir Turakulov fbf01c5431 remove slave_build path
slave_build path, defined by infra_paths module, is unnecessarily tied
to our buildbot setup which we are trying to deprecate in favor of LUCI.
In practice it is always == start_dir and that's what we want in LUCI too.

Update all code that uses slave_build path to use start_dir instead.

R=iannucci@chromium.org, martiniss@chromium.org
BUG=662586

Change-Id: Id52aa535d6a4f52670d581bf56aab65f670b1861
Reviewed-on: https://chromium-review.googlesource.com/412075
Commit-Queue: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
9 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
recipe-roller e0b205e884 Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

Please review the expectation changes, and LGTM as normal. The recipe roller
will *NOT* CQ the change itself, so you must CQ the change manually.

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/2c474706779466f2e18e83a632f6d6debf63787f Fix issue overriding bug properties.test_api.tryserver for Gerrit. (tandrii@chromium.org)

R=tandrii@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2473883003
9 years ago
tandrii 9701c7c16d Recipes: Stop using tryserver_gerrit in depot_tools.
Only changes how test properties are given, no change in functionality.
Should enable recipe roll of https://codereview.chromium.org/2464673002.

R=martiniss@chromium.org,machenbach@chromium.org
BUG=chromium:645616

Review-Url: https://codereview.chromium.org/2468373002
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
borenet d918da6427 Remove apply_gerrit_ref from bot_update recipe API
BUG=skia:5588

Review-Url: https://codereview.chromium.org/2453663004
9 years ago
tandrii 51a7b096ca bot_update: understand new Gerrit patch properties.
This change is backwards compatible, so no expectation changes expected
in downstream rolls.

Depends on https://codereview.chromium.org/2442173003 recipe_engine
change.

BUG=645616
R=martiniss@chromium.org,machenbach@chromium.org

Review-Url: https://codereview.chromium.org/2439373002
9 years ago
hinoka bc0b4c6e41 Change path to internal-try rietveld credentials
To match where it ended up being located.

BUG=642150

Review-Url: https://chromiumcodereview.appspot.com/2436853002
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
tandrii 15a248123d Revert of bot_update: ensure correct depot_tools checkout is used. (patchset #2 id:20001 of https://codereview.chromium.org/2346973003/ )
Reason for revert:
broke win_chromium_x64_rel_ng/builds/281022
because of apply_issue.bat calls local python.

Original issue's description:
> bot_update: ensure correct depot_tools checkout is used.
>
> R=vadimsh@chromium.org,martiniss@chromium.org
> BUG=635641,647446
>
> Committed: 972ac50401

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

Review-Url: https://codereview.chromium.org/2349673002
9 years ago
tandrii 972ac50401 bot_update: ensure correct depot_tools checkout is used.
R=vadimsh@chromium.org,martiniss@chromium.org
BUG=635641,647446

Review-Url: https://codereview.chromium.org/2346973003
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
iannucci 990ab1b42c Remove force parameter from bot_update.ensure_checkout.
This is the simplest change I can make here. The bot_update.py script already
ignores the value of force (and sets it to True in all cases). This is an
expectations-only change.

I'll refactor the content of the bot_update.py script to account for this
removed option in a followup CL as well.

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

Review-Url: https://codereview.chromium.org/2316323002
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
andybons f0b0378318 Remove gerrit_rebase_patch_ref flag from bot_update API
BUG=612417

Review-Url: https://codereview.chromium.org/2317213002
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
agable 7090f652d1 Remove all references to GIT_MODE from depot_tools
BUG=640251,472386

Review-Url: https://codereview.chromium.org/2286793003
9 years ago