Commit Graph

53 Commits (d343c63519c179f158c522f27f332e129d27a26c)

Author SHA1 Message Date
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 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
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
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 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
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
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
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
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
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
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
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
rmistry 2250d5b3b0 Add apply_gerrit_ref to bot_update api.
BUG=skia:5627

Review-Url: https://codereview.chromium.org/2249983004
9 years ago
hinoka d2c82a25e8 Bot_update recipe output: Add 'Try Rebasing' to patch failure output
I still see confusion around patch failures.  This should clearify things.

BUG=

Review-Url: https://codereview.chromium.org/2231953002
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
tandrii 6da50398be bot_update: improve UX when gclient is not configured.
Instead of long stacktrace, explain what went wrong.

R=sergiyb@chromium.org,andybons@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2175343002
9 years ago
martiniss 8697dfcf8b Fix bot_update to correctly handle exceptions
If an exception occurs during a try block which prevents a step from actually executing, then the finally block's attempt to access step.active_result will fail, and the original exception will be hidden behind a new exception from the recipe engine. This CL changes this behavior so that the original exception will always fire.

Review-Url: https://codereview.chromium.org/2175103002
9 years ago
martiniss 575e6766f2 bot_update: Allow patch_oauth2 to work in kitchen
site config is not present on builders which use kitchen, so we need to use credentials provided by puppet in the /creds directory.

BUG=624212
TBR=hinoka

Review-Url: https://codereview.chromium.org/2108073002
9 years ago
martiniss@chromium.org 25837199f3 Revert of Reland of depot_tools: add infra_paths recipe module for infra-specific paths (patchset #1 id:1 of https://codereview.chromium.org/1917263002/ )
Hopefully everything will be back to normal now...

Original issue's description:
> depot_tools: add infra_paths recipe module for infra-specific paths
>
> Depends on https://codereview.chromium.org/1906323003
>
> BUG=chromium:605919
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=300184

TBR=iannucci@chromium.org,hinoka@chromium.org,phajdan.jr@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:605919

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300210 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
tandrii@chromium.org d34c90601f Reland of depot_tools: add infra_paths recipe module for infra-specific paths (patchset #1 id:1 of https://codereview.chromium.org/1917263002/ )
Reason for revert:
re-landing because wrong order of reverts :(

Original issue's description:
> Revert of depot_tools: add infra_paths recipe module for infra-specific paths (patchset #2 id:20001 of https://codereview.chromium.org/1915463002/ )
> 
> Reason for revert:
> breaks skia bots :(
> 
> Original issue's description:
> > depot_tools: add infra_paths recipe module for infra-specific paths
> > 
> > Depends on https://codereview.chromium.org/1906323003
> > 
> > BUG=chromium:605919
> > 
> > Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=300184
> 
> TBR=iannucci@chromium.org,martiniss@chromium.org,phajdan.jr@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=chromium:605919
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=300199

TBR=iannucci@chromium.org,martiniss@chromium.org,phajdan.jr@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:605919

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300200 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
tandrii@chromium.org 54e0d26399 Revert of depot_tools: add infra_paths recipe module for infra-specific paths (patchset #2 id:20001 of https://codereview.chromium.org/1915463002/ )
Reason for revert:
breaks skia bots :(

Original issue's description:
> depot_tools: add infra_paths recipe module for infra-specific paths
> 
> Depends on https://codereview.chromium.org/1906323003
> 
> BUG=chromium:605919
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=300184

TBR=iannucci@chromium.org,martiniss@chromium.org,phajdan.jr@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:605919

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300199 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
phajdan.jr@chromium.org f30e872853 depot_tools: add infra_paths recipe module for infra-specific paths
Depends on https://codereview.chromium.org/1906323003

BUG=chromium:605919

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300184 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
tandrii@chromium.org 6149999985 patch_root hacks cleanup.
Removes deprecated patch_project_roots in bot_update,
and the TODOs used for migration.

Depends: https://codereview.chromium.org/1913863002

R=phajdan.jr@chromium.org,machenbach@chromium.org
BUG=605563

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300153 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
tandrii@chromium.org e0b4931495 patch_root cleanup: transition everyone to new code.
This doesn't create recipe expectations changes.

Depends: https://codereview.chromium.org/1920903002/
Allows: https://codereview.chromium.org/1913863002

R=machenbach@chromium.org,phajdan.jr@chromium.org
BUG=605563

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300150 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
tandrii@chromium.org cb3fd431fd Generalize patch_project to patch root conversion.
IMPORTANT: See bug http://crbug.com/605563#c3 for deployment and emergency roll-back plan.

This patch is first of a series. It provides a cleaner and generic way to apply patches to non-root of first solution.

R=phajdan.jr@chromium.org,machenbach@chromium.org
BUG=605563

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300141 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
martiniss@chromium.org 375aa58877 Make the config -> pythonish conversion a gclient module function.
Also makes bot_update use this.

This allows for clank to manually set the gclient config.

BUG=590788

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299398 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
martiniss@chromium.org 29c3b34610 bot_update: Rewrite to use properties, and add override options for patches.
Depends on https://codereview.chromium.org/1755593003

BUG=591172

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299332 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
martiniss@chromium.org 21217f42df Convert the bot_update module to use properties
R=iannucci@chromium.org
BUG=591172

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299329 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
martiniss@chromium.org 5fc657ba8a Reland of Use gclient's git_cache setting in bot_update/api.py
https://codereview.chromium.org/1762513002/

Use gclient's git_cache setting in bot_update/api.py

BUG=589140
R=szager@chromium.org,iannucci@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299260 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
phajdan.jr@chromium.org 88e173be1a depot_tools: adjust for resource API changes in recipe engine
This is rolling in https://codereview.chromium.org/1777003003

BUG=593420

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299187 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
martiniss@chromium.org 907a1e7c8e Revert of Use gclient's git_cache setting in bot_update/api.py (patchset #6 id:100001 of https://codereview.chromium.org/1762513002/ )
Reason for revert:
Roll into build breaks infra crons.

Original issue's description:
> Use gclient's git_cache setting in bot_update/api.py
>
> BUG=589140
> R=agable@chromium.org
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=299120

TBR=agable@chromium.org,hinoka@chromium.org,hinoka@google.com,iannucci@chromium.org,wkorman@chromium.org,szager@chromium.org
BUG=589140

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299160 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
szager@chromium.org 88be9a1c5a Use gclient's git_cache setting in bot_update/api.py
BUG=589140
R=agable@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299120 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
hinoka@chromium.org 70a43af908 Read got_revision_mapping from built in spec
Sometimes the spec passed in via parameters also have got_revision_mapping that
we want to use.

BUG=590788

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299015 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
phajdan.jr@chromium.org 0097973a0e bot_update: add depot_tools to PATH so that e.g. apply_issue can be found (reland #1)
Original attempt: https://codereview.chromium.org/1660943002

Now adds depot_tools at the end of PATH to avoid issues with python
on Windows.

TBR=jochen

BUG=437264

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298562 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
kjellander@chromium.org fc064509b0 Revert of bot_update: add depot_tools to PATH so that e.g. apply_issue can be found (patchset #1 id:1 of https://codereview.chromium.org/1660943002/ )
Reason for revert:
I believe this breaks trybot patching on Windows. 

Example: https://build.chromium.org/p/tryserver.webrtc/builders/win_x64_gn_rel/builds/6811

Error: 
'E:\b\build\scripts\slave\.recipe_deps\depot_tools\python' is not recognized as an internal or external command,
operable program or batch file.

I'm speculatively reverting.

Original issue's description:
> bot_update: add depot_tools to PATH so that e.g. apply_issue can be found
> 
> BUG=437264
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=298556

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298561 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
phajdan.jr@chromium.org c8b8c31222 bot_update: add depot_tools to PATH so that e.g. apply_issue can be found
BUG=437264

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298556 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
phajdan.jr@chromium.org 735881c8df bot_update: make location of git cache configurable
Depends on https://codereview.chromium.org/1667713002

BUG=583626

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

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