New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 643346 link

Starred by 6 users

Issue metadata

Status: Fixed
Owner:
Closed: Jun 2018
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: All
Pri: 2
Type: Feature

Blocked on:
issue 624178

Blocking:
issue angleproject:2449



Sign in to add a comment

Give bot_update cleaner support for syncing deps to refs/changes/*

Project Member Reported by jmad...@chromium.org, Sep 1 2016

Issue description

Currently bot_update will sync, apply the patch, then ignore recursedeps. This isn't ideal for ANGLE since we have a few DEPS we maintain for Chromium. Ideally there would be a second step that would sync only the DEPS in recursedeps of the currently applied patch.

Andrii can you set up the appropriate labels for this bug and possibly find someone to work on it? If not I'd have to take the plunge myself, I think this is a blocker for Vulkan on ANGLE, since we'll likely be rolling DEPS for Vulkan libs fairly regularly.
 
Showing comments 26 - 125 of 125 Older
I think we concluded that there wasn't actually anything to do here as long as your DEPS modifications point to other Gerrit CLs?

Do we need to change something maybe to actually do the recursion?

Status: Started (was: Assigned)
Right, the DEPS modifications just have to point at Gerrit CL refs. The problem is that, right now, gclient doesn't actually fetch the refs that deps are pinned at -- it just does basic fetches and hopes the necessary refs show up. The two CLs above were refactoring work to make that possible, and I now have a CL in flight to fix that: https://codereview.chromium.org/2448303002
Blockedon: 624178
Blocking: 671021

Comment 30 by kbr@chromium.org, Dec 9 2016

Cc: andyb...@chromium.org
Components: Infra>Client
Labels: -Pri-2 Pri-1
Aaron, if you're swamped, could we find another engineer to move this forward with your guidance? +andybons

This causes fundamental problems with certain test upgrades in the ANGLE repository. We can't safely update the dEQP dependency inside ANGLE because the CQ tryjobs won't test at the new dEQP revision. Essentially, the GPU optional trybots and ANGLE CQ are guaranteed to be broken for some period of time during upgrades like this ( Issue 671021 ).

Raising to P1 RFE.

Blocking: -671021

Comment 32 by kbr@chromium.org, Dec 13 2016

Owner: andyb...@chromium.org
Andy, as head of the Chrome Crossover team, please let me assign this to you to find someone to pick up Aaron's work and push it to completion.

This is a big blocker. It's affecting two of ANGLE's dependencies, and makes it so that it's impossible to send try jobs for these DEPS rolls. In effect, it's mandatory to temporarily break the trybots to do these rolls.

Owner: iannucci@chromium.org
Status: Assigned (was: Started)
Robbie, can you take a look at this?
Apologies for the lack of updates on this bug; I've been communicating with jmadill primarily over chat and email.

I don't feel like the (now apparent) priority of this issue was clearly communicated to me. I was under the impression that it was an inconvenience to Jamie's work, not that it was blocking an entire common class of work for a whole team.

It is now clear that this work should be given a higher priority. This work needs to be completed in two stages:
1) Finishing the blocking bug ( issue chromium:624178 ). There is already a CL in the works for that bug (https://codereview.chromium.org/2448303002), but it is a big, scary, dangerous, untestable change to the underpinnings of gclient. The purpose of that work is to make it so that gclient can dynamically fetch whatever refs it is told to check out, instead of dying in a fire as soon as it is asked to check out a ref that isn't already in the default fetch refspec.
2) Once that lands, the recipes used by angle for testing need to be taught to pass the "--revision some/dep/here@refs/changes/NN/NNNNNN" flag, which will automatically override whatever is currently pinned in the DEPS file, allowing for dynamic testing of DEPS rolls.

Currently, the blocking bug for (1) is still assigned to me. If I'm truly the only person who understands gclient well enough to finish that change, and we agree that this work is higher priority, then I can dedicate time to finishing that. (Note, however, that no one will be able to land that change between Dec 22 - Jan 2, due to the chrome infra prod freeze.) If it is instead more appropriate for someone else (such as Robbie, who just had this bug assigned to him) to take over that work, then they should take that bug as well.
Owner: dpranke@chromium.org
I'm going to grab this from Robbie, given that I'm theoretically reworking gclient at the moment.
I haven't gotten a chance to look at this yet, but I'm hoping to get to it in the next day or two.

As agable@ says, it's unlikely that we'll get this landed before the prod freeze, and it's unlikely that we'd want to land something that we currently think is pretty risky during the freeze.

Is that going to be acceptable?
Quite acceptable. We won't be in a situation where we have to do something dangerous unless we need to roll our DEPS, which we can avoid doing in the next month.
Blocking: -angleproject:1319
Update: Yes, I still haven't gotten to this. I am going to try very hard to get to it this week, or find someone else who can work on it promptly.
Thanks for the update.
Labels: OS-All
Cc: -andyb...@chromium.org
Summary: Make gclient work with DEPS that point to Gerrit refs (was: Sync recurseDEPS *after* patch application to DEPS-ed in project in bot_update/gclient)
I'm going to change the subject here from

"Sync recurseDEPS *after* patch application to DEPS-ed in project in bot_update/gclient"

to

"Make gclient work with DEPS that point to Gerrit refs"

to reflect what we actually want to do now.
dpranke@ this sounded like it was high on the radar but there are no recent updates.  Could you provide an update on what you expect to happen?  Thanks.
Cc: phajdan.jr@chromium.org
Owner: phajdan.jr@chromium.org
Paweł, is this something you could take a look at? I meant to do this as part of my work on gclient, but I never got to that work and you took it over ...
Issue 750638 has been merged into this issue.
Pawel did you need any input from the users on your design doc?
Very cool - should I expect a recursedeps-based deps roll with the ANGLE CQ to work?
Labels: -Pri-1 Pri-2
Owner: jmad...@chromium.org
Spoke to Aaron offline - this should be pretty implementable in our recipe now that  issue 624178  is fixed.

I had some trouble using the --revision syntax in my local checkout. sync became slow or hung on src/, instead of being skipped as unmanaged. Writing a custom_deps line in my .gclient worked well, it checked out the recursive deps update in https://chromium-review.googlesource.com/c/angle/angle/+/703159 .

I'll see if I can modify the ANGLE CQ to use a custom gclient file. Lowering priority though as this isn't blocking anything except dEQP and Vulkan SDK rolls.
Owner: phajdan.jr@chromium.org
Spoke to agable again, this work is ongoing as part of the Reitveld turndown. Will defer any action until bot_update is updated to pull the right ref.
Summary: Give bot_update cleaner support for syncing deps to refs/changes/* (was: Make gclient work with DEPS that point to Gerrit refs)
Owner: ----
Status: Untriaged (was: Assigned)
Removing myself from bugs because of team transfer, back to re-triage.

See https://goto.google.com/phajdan-goodbye-chrome (Google-internal) and  issue 783662  .

In case of any questions, feel free to ask - use phajdan@google.com for a faster response.
Owner: jmad...@chromium.org
Status: Assigned (was: Untriaged)
Reitveld turndown is done, next steps?
Owner: aga...@chromium.org
This needs to be done by someone in infra ...
Dirk: only kinda sorta. gclient *does* now support syncing DEPS which point to arbitrary refs, including refs/changes/*.

All that needs to happen now is the plumbing for recipes to pass "--revision src/my/dep@refs/changes/some/change" to bot_update and the rest is in place.
I certainly would be happy if someone in infra could help with this.
@agable - fair enough. I wasn't sure if the gclient work had been fully completed.

Do we know if the right things get passed from Gerrit through buildbucket, and it literally is just a recipe change?
The buildbucket object (and therefore the build properties) have all the necessary information. There need to be some changes to the bot_update recipe module, and then probably a small change to the angle recipe to take advantage of that.
FYI, ANGLE uses the Chromium recipe.
Project Member

Comment 62 by bugdroid1@chromium.org, Mar 7 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/53014653d8eb98ac09f1ea1bb5231bcd8c92ff66

commit 53014653d8eb98ac09f1ea1bb5231bcd8c92ff66
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Wed Mar 07 23:29:59 2018

gclient: Give priority to URL over paths when specifying revisions.

e.g. when specifying both '--revision src@<something>' and
'--revision <src_gerrit_repo>@<some_gerrit_ref>', gclient will sync to
'<some_gerrit_ref>' instead of '<something>'.

This is useful when specifying which gerrit change to patch, which
should take priority over other revision specifications.

Bug:  chromium:643346 
Change-Id: Ibc21ede355b56e4da966f38f144ce6f6f1743403
Reviewed-on: https://chromium-review.googlesource.com/949981
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/53014653d8eb98ac09f1ea1bb5231bcd8c92ff66/gclient.py
[modify] https://crrev.com/53014653d8eb98ac09f1ea1bb5231bcd8c92ff66/tests/gclient_smoketest.py

Owner: ehmaldonado@chromium.org
Status: Started (was: Assigned)
Project Member

Comment 64 by bugdroid1@chromium.org, Mar 22 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/c621b21ad4bfce59924ffc0116eff58bcd4b8bc0

commit c621b21ad4bfce59924ffc0116eff58bcd4b8bc0
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Mar 22 19:24:06 2018

gclient sync: Add support to apply gerrit refs.

Mimics bot_update's functionality to apply gerrit refs in gclient
via --gerrit-ref flags.
When the patch fails to apply, gclient sync will return exit code 2.

The idea is to move this logic from bot_update to gclient sync to
deal when patches for projects like ANGLE are tried on Chromium bots.
This way the patch is applied before recursively parsing and syncing
ANGLE’s DEPS.chromium file, which doesn't currently happen.

Bug:  643346 

Change-Id: I7e2018b3c393a5ac9852b8c3611f906977eeeb18
Reviewed-on: https://chromium-review.googlesource.com/961605
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/c621b21ad4bfce59924ffc0116eff58bcd4b8bc0/gclient_scm.py
[modify] https://crrev.com/c621b21ad4bfce59924ffc0116eff58bcd4b8bc0/testing_support/fake_repos.py
[modify] https://crrev.com/c621b21ad4bfce59924ffc0116eff58bcd4b8bc0/tests/gclient_scm_test.py
[modify] https://crrev.com/c621b21ad4bfce59924ffc0116eff58bcd4b8bc0/gclient.py
[modify] https://crrev.com/c621b21ad4bfce59924ffc0116eff58bcd4b8bc0/tests/gclient_smoketest.py
[modify] https://crrev.com/c621b21ad4bfce59924ffc0116eff58bcd4b8bc0/tests/gclient_test.py

Project Member

Comment 65 by bugdroid1@chromium.org, Mar 22 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e3d38d1589768b034805fc1c20892c8e0e209ba2

commit e3d38d1589768b034805fc1c20892c8e0e209ba2
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Thu Mar 22 20:29:23 2018

Roll src/third_party/depot_tools/ 869a2857a..c621b21ad (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/869a2857a4f3..c621b21ad4bf

$ git log 869a2857a..c621b21ad --date=short --no-merges --format='%ad %ae %s'
2018-03-21 ehmaldonado gclient sync: Add support to apply gerrit refs.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: If956299b768756d0d2d0ceb34878629b90708e52
Reviewed-on: https://chromium-review.googlesource.com/976388
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#545229}
[modify] https://crrev.com/e3d38d1589768b034805fc1c20892c8e0e209ba2/DEPS

Woo... happy to see progress on this!
Project Member

Comment 68 by bugdroid1@chromium.org, Mar 27 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/ee04b9a2f4890af563a21a69871d20fd6a586ce4

commit ee04b9a2f4890af563a21a69871d20fd6a586ce4
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Tue Mar 27 00:03:08 2018

bot_update: Make gclient experiment a property instead of an argument.

Is easier to configure experimental bots this way.

Bug:  643346 
Change-Id: Idb6d3a68b02949dce71dbcba38e8ef756c467830
Reviewed-on: https://chromium-review.googlesource.com/981515
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

[modify] https://crrev.com/ee04b9a2f4890af563a21a69871d20fd6a586ce4/recipes/recipe_modules/bot_update/examples/full.py
[modify] https://crrev.com/ee04b9a2f4890af563a21a69871d20fd6a586ce4/tests/bot_update_coverage_test.py
[rename] https://crrev.com/ee04b9a2f4890af563a21a69871d20fd6a586ce4/recipes/recipe_modules/bot_update/examples/full.expected/apply_patch_on_gclient.json
[modify] https://crrev.com/ee04b9a2f4890af563a21a69871d20fd6a586ce4/recipes/recipe_modules/bot_update/test_api.py
[modify] https://crrev.com/ee04b9a2f4890af563a21a69871d20fd6a586ce4/recipes/README.recipes.md
[modify] https://crrev.com/ee04b9a2f4890af563a21a69871d20fd6a586ce4/recipes/recipe_modules/bot_update/api.py
[modify] https://crrev.com/ee04b9a2f4890af563a21a69871d20fd6a586ce4/recipes/recipe_modules/bot_update/resources/bot_update.py
[modify] https://crrev.com/ee04b9a2f4890af563a21a69871d20fd6a586ce4/recipes/recipe_modules/bot_update/__init__.py

Project Member

Comment 69 by bugdroid1@chromium.org, Mar 27 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/45b7731b5a03b682d17622794fe37d37c13a7d3e

commit 45b7731b5a03b682d17622794fe37d37c13a7d3e
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Tue Mar 27 05:51:50 2018

Roll src/third_party/depot_tools/ 4732b3b1c..ee04b9a2f (2 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/4732b3b1c4bf..ee04b9a2f489

$ git log 4732b3b1c..ee04b9a2f --date=short --no-merges --format='%ad %ae %s'
2018-03-26 ehmaldonado bot_update: Make gclient experiment a property instead of an argument.
2018-03-26 ehmaldonado bot_update: Add a flag to move applying the patch to gclient.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 , chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I01dfb181687e4f1e325d13aed34ebbb3cf0c96e6
Reviewed-on: https://chromium-review.googlesource.com/981783
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#546031}
[modify] https://crrev.com/45b7731b5a03b682d17622794fe37d37c13a7d3e/DEPS

Project Member

Comment 70 by bugdroid1@chromium.org, Mar 29 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0a8fbee268c709e62a0d8295457a490761bf12b0

commit 0a8fbee268c709e62a0d8295457a490761bf12b0
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Mar 29 02:35:43 2018

infra/config: Add experimental bot to test patching on GClient.

Add linux_chromium_rel_ng_patch_on_gclient as an experimental builder at
5% to test that patching on GClient instead of bot_update works as
intended.

Bug:  643346 
Change-Id: I6af85c344fff4e4d88c66b5e96872fbb90ffbb8d
Reviewed-on: https://chromium-review.googlesource.com/983012
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#546706}
[modify] https://crrev.com/0a8fbee268c709e62a0d8295457a490761bf12b0/infra/config/branch/cq.cfg
[modify] https://crrev.com/0a8fbee268c709e62a0d8295457a490761bf12b0/infra/config/global/cr-buildbucket.cfg

Project Member

Comment 71 by bugdroid1@chromium.org, Mar 29 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a47f9e213669ef5b46c01569ebc9395587c26282

commit a47f9e213669ef5b46c01569ebc9395587c26282
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Mar 29 22:37:24 2018

infra/config: Add builder dimension to linux_chromium_rel_ng_patch_on_gclient

Add "builder:linux_chromium_rel_ng" as a dimension to the bot, so it can
run on the same machines the original bot runs on.

R=nodir@chromium.org, iannucci@chromium.org

Bug:  643346 
Change-Id: Ief4a165d796d2a6d14dfc856858293b370b47afc
Reviewed-on: https://chromium-review.googlesource.com/986993
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#546990}
[modify] https://crrev.com/a47f9e213669ef5b46c01569ebc9395587c26282/infra/config/global/cr-buildbucket.cfg

Project Member

Comment 72 by bugdroid1@chromium.org, Mar 29 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/34c3f5d638f067fab1b3e6ed858908c81cbbe207

commit 34c3f5d638f067fab1b3e6ed858908c81cbbe207
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Mar 29 23:38:11 2018

infra/config: Put linux_chromium_rel_ng_patch_on_gclient on the right bucket.

It should be luci.chromium.try, not master.tryserver.chromium.linux.

R=nodir@chromium.org, iannucci@chromium.org, jbudorick@chromium.org

Bug:  643346 
Change-Id: I55ad4fad5238e1c2f1f6047cdc9b22131c7080e7
Reviewed-on: https://chromium-review.googlesource.com/986627
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547020}
[modify] https://crrev.com/34c3f5d638f067fab1b3e6ed858908c81cbbe207/infra/config/branch/cq.cfg

Project Member

Comment 73 by bugdroid1@chromium.org, Mar 30 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/bb16e339ce721505ba056af616d3685e80671fe1

commit bb16e339ce721505ba056af616d3685e80671fe1
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Fri Mar 30 21:59:57 2018

gclient: Search also for URL + '.git' when looking for dependencies.

The URLs for the dependencies in DEPS files might end in '.git', so
search for them too.

R=agable@chromium.org

Bug:  643346 
Change-Id: I955c2750179b54fec26423f5123b3fa7eea38d96
Reviewed-on: https://chromium-review.googlesource.com/987630
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/bb16e339ce721505ba056af616d3685e80671fe1/tests/gclient_test.py
[modify] https://crrev.com/bb16e339ce721505ba056af616d3685e80671fe1/gclient.py
[modify] https://crrev.com/bb16e339ce721505ba056af616d3685e80671fe1/tests/gclient_smoketest.py

Project Member

Comment 74 by bugdroid1@chromium.org, Mar 30 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9b4794eb226d33487eeb498f51c9fe661e344f98

commit 9b4794eb226d33487eeb498f51c9fe661e344f98
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Fri Mar 30 23:24:06 2018

Roll src/third_party/depot_tools/ 63e216c6e..bb16e339c (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/63e216c6ef92..bb16e339ce72

$ git log 63e216c6e..bb16e339c --date=short --no-merges --format='%ad %ae %s'
2018-03-30 ehmaldonado gclient: Search also for URL + '.git' when looking for dependencies.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Ib8b3c1a93aa1f4b2f21a0047d6568c12c27a1587
Reviewed-on: https://chromium-review.googlesource.com/988872
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#547315}
[modify] https://crrev.com/9b4794eb226d33487eeb498f51c9fe661e344f98/DEPS

Project Member

Comment 75 by bugdroid1@chromium.org, Mar 31 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/aeb61ad6888b1b28cafe6ae77cd6908af7972a6a

commit aeb61ad6888b1b28cafe6ae77cd6908af7972a6a
Author: John Budorick <jbudorick@chromium.org>
Date: Fri Mar 30 23:59:27 2018

Kick the recipe roller to pick up gclient changes.

in particular, https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/987630

Bug:  643346 
Change-Id: I629f0ee3fe43133d007c7d8059f3ff8616ec782a
Reviewed-on: https://chromium-review.googlesource.com/989032
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>

[modify] https://crrev.com/aeb61ad6888b1b28cafe6ae77cd6908af7972a6a/recipes/trigger_recipe_roller.txt

Project Member

Comment 76 by bugdroid1@chromium.org, Mar 31 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/8271d225421b16316a143ce7b8f7411a489e6360

commit 8271d225421b16316a143ce7b8f7411a489e6360
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Sat Mar 31 01:34:07 2018

gclient_scm: Don't try to update file_list if it's None.

file_list can be none if gclient runs with --nohooks.
Fix apply_patch_ref so that it doesn't try to update file_list when it is
None.

TBR=agable@chromium.org

Bug:  643346 
Change-Id: If00547da004415edfe68196a44cbda753b4db017
Reviewed-on: https://chromium-review.googlesource.com/989279
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/8271d225421b16316a143ce7b8f7411a489e6360/tests/gclient_smoketest.py
[modify] https://crrev.com/8271d225421b16316a143ce7b8f7411a489e6360/gclient_scm.py
[modify] https://crrev.com/8271d225421b16316a143ce7b8f7411a489e6360/recipes/trigger_recipe_roller.txt

Project Member

Comment 77 by bugdroid1@chromium.org, Mar 31 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9c8ba97a2079aba2c11ef6442073e3c280694418

commit 9c8ba97a2079aba2c11ef6442073e3c280694418
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Sat Mar 31 03:03:42 2018

Roll src/third_party/depot_tools/ 62af4e40a..012013ee5 (2 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/62af4e40a8f4..012013ee5940

$ git log 62af4e40a..012013ee5 --date=short --no-merges --format='%ad %ae %s'
2018-03-30 mmoss Add tests and fixes for |None| url values in deps entries.
2018-03-30 jbudorick Kick the recipe roller to pick up gclient changes.

Created with:
  roll-dep src/third_party/depot_tools
BUG=chromium:825063, chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I8244d29e5855f54b16e03fa5b60f0cee4e828d36
Reviewed-on: https://chromium-review.googlesource.com/989285
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#547366}
[modify] https://crrev.com/9c8ba97a2079aba2c11ef6442073e3c280694418/DEPS

Project Member

Comment 78 by bugdroid1@chromium.org, Mar 31 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/fa52316e5dd9ec1d5cc95cac6b717644bbffb4e3

commit fa52316e5dd9ec1d5cc95cac6b717644bbffb4e3
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Sat Mar 31 10:21:58 2018

Roll src/third_party/depot_tools/ 012013ee5..0d466d22d (2 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/012013ee5940..0d466d22d8e2

$ git log 012013ee5..0d466d22d --date=short --no-merges --format='%ad %ae %s'
2018-03-23 svillar git cl believes I'm working inside GCE
2018-03-30 ehmaldonado gclient_scm: Don't try to update file_list if it's None.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Idf2a74bcbc3fcb07d9a6cbf24d3b5c8ace6441c8
Reviewed-on: https://chromium-review.googlesource.com/989412
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#547383}
[modify] https://crrev.com/fa52316e5dd9ec1d5cc95cac6b717644bbffb4e3/DEPS

Project Member

Comment 79 by bugdroid1@chromium.org, Apr 2 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/d69c5dd538ee50cb088a57bce7e33ef6676ddd13

commit d69c5dd538ee50cb088a57bce7e33ef6676ddd13
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Mon Apr 02 21:01:24 2018

bot_update: Don't patch if gerrit_repo or gerrit_ref are empty/None.

We should apply the patch only when gerrit_repo and gerrit_ref are passed,
instead of using only the --apply-patch-on-gclient flag.

R=agable@chromium.org

Bug:  643346 
Change-Id: I28547aed9daeefa2657a108e0bacbfd4fc9fa07e
Reviewed-on: https://chromium-review.googlesource.com/989667
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/d69c5dd538ee50cb088a57bce7e33ef6676ddd13/recipes/recipe_modules/bot_update/resources/bot_update.py

Project Member

Comment 80 by bugdroid1@chromium.org, Apr 3 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/98af1b5696ccac71d4b141d1a0d25dc9f73091f7

commit 98af1b5696ccac71d4b141d1a0d25dc9f73091f7
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Tue Apr 03 00:23:19 2018

Roll src/third_party/depot_tools/ 31e7d56c2..81b26429c (6 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/31e7d56c28f1..81b26429c8f6

$ git log 31e7d56c2..81b26429c --date=short --no-merges --format='%ad %ae %s'
2018-04-02 bpastene depot_tools: Kick the recipe roller.
2018-04-02 agable Revert "Remove Rietveld support from presubmit"
2018-04-02 ehmaldonado bot_update: Don't patch if gerrit_repo or gerrit_ref are empty/None.
2018-04-02 agable Disallow TBRs to OWNERS files
2018-04-02 agable git-cl-try: document auth_config for buildbucket
2018-04-02 agable Remove Rietveld support from presubmit

Created with:
  roll-dep src/third_party/depot_tools
BUG=chromium:828154,chromium:770408, chromium:643346 ,chromium:688115,chromium:770408


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I830e86112dda7d11bdca0537ab8879e1a8d745b2
Reviewed-on: https://chromium-review.googlesource.com/991085
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#547578}
[modify] https://crrev.com/98af1b5696ccac71d4b141d1a0d25dc9f73091f7/DEPS

Project Member

Comment 81 by bugdroid1@chromium.org, Apr 3 2018

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infradata/config/+/d60154cf14f2e5b71c7441a8c0838eec8e448a76

commit d60154cf14f2e5b71c7441a8c0838eec8e448a76
Author: Edward Lesmes <ehmaldonado@google.com>
Date: Tue Apr 03 18:52:42 2018

Project Member

Comment 82 by bugdroid1@chromium.org, Apr 4 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ec6441e318d3a4f2b4416edfc83856a8db4f374c

commit ec6441e318d3a4f2b4416edfc83856a8db4f374c
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Wed Apr 04 18:59:54 2018

infra/config: Add experimental *compile* bot to test patching on GClient.

Add linux_chromium_compile_rel_ng_patch_on_gclient as an experimental builder
at 5% to test that patching on GClient instead of bot_update works as intended.

Bug:  643346 
Change-Id: I2e1cc2961db6720bbb4b6c84d8764fb0bc5f1473
Reviewed-on: https://chromium-review.googlesource.com/991163
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548144}
[modify] https://crrev.com/ec6441e318d3a4f2b4416edfc83856a8db4f374c/infra/config/branch/cq.cfg
[modify] https://crrev.com/ec6441e318d3a4f2b4416edfc83856a8db4f374c/infra/config/global/cr-buildbucket.cfg

Project Member

Comment 83 by bugdroid1@chromium.org, Apr 5 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3a46f55e7fc8c91104143241c4e35f6ee0318d1c

commit 3a46f55e7fc8c91104143241c4e35f6ee0318d1c
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Apr 05 18:43:40 2018

infra/config: Bring back linux_chromium_rel_ng_patch_on_gclient.

Will be used to check that deapplying the patch on gclient works as well.

Bug:  643346 
Change-Id: I7428af15b48b772e2e8bc9662563cb880169dfac
Reviewed-on: https://chromium-review.googlesource.com/996562
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548505}
[modify] https://crrev.com/3a46f55e7fc8c91104143241c4e35f6ee0318d1c/infra/config/global/cr-buildbucket.cfg

Blocking: angleproject:2449
Awesome progress. Is there anywhere I can see the experimental config running?
Cc: -tandrii@chromium.org
Project Member

Comment 89 by bugdroid1@chromium.org, Apr 13 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/96f94db22f5772d3d93a2d951c4267511099c2d6

commit 96f94db22f5772d3d93a2d951c4267511099c2d6
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Fri Apr 13 23:07:10 2018

cr-buildbucket.cfg: Set apply_patch_on_gclient for CQ linux bots.

Bug:  643346 
Change-Id: I1a5204492c232381ff436b5c3c0133408483416c
Reviewed-on: https://chromium-review.googlesource.com/1011216
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550778}
[modify] https://crrev.com/96f94db22f5772d3d93a2d951c4267511099c2d6/infra/config/global/cr-buildbucket.cfg

BTW, what bots do you use to try ANGLE patches on Chromium? So I can flip those first :)
ehmaldonado: everything in tryserver.chromium.angle:

https://ci.chromium.org/p/chromium/g/tryserver.chromium.angle/builders

Let me know if you need any advice. And thanks!
Project Member

Comment 92 by bugdroid1@chromium.org, Apr 17 2018

Labels: merge-merged-testbranch
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/96f94db22f5772d3d93a2d951c4267511099c2d6

commit 96f94db22f5772d3d93a2d951c4267511099c2d6
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Fri Apr 13 23:07:10 2018

cr-buildbucket.cfg: Set apply_patch_on_gclient for CQ linux bots.

Bug:  643346 
Change-Id: I1a5204492c232381ff436b5c3c0133408483416c
Reviewed-on: https://chromium-review.googlesource.com/1011216
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550778}
[modify] https://crrev.com/96f94db22f5772d3d93a2d951c4267511099c2d6/infra/config/global/cr-buildbucket.cfg

Project Member

Comment 93 by bugdroid1@chromium.org, Apr 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d

commit 355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Tue Apr 24 22:57:29 2018

bot_update: Patch on gclient by default.

See [4] for the design doc for this change.

We're moving the patching logic from bot_update to gclient.
This way we can test patches of dependencies that modify their DEPS
files as well, for example when ANGLE uploads a patch that modifies
DEPS files to be tested by a Chromium trybot.

Chromium Linux CQ and Angle trybots are already running this way
(see [1] and [2]) and a PSA has already been sent [3]

[1] https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/cr-buildbucket.cfg#214
[2] https://chromium.googlesource.com/angle/angle/+/infra/config/cr-buildbucket.cfg#105
[3] https://groups.google.com/a/google.com/forum/#!topic/chrome-infra/FVHN2kdUX4I
[4] https://docs.google.com/document/d/1GSTw4ysm5AYjNR6vMA7NJUxLK2VN9IpOEp_v0u-wyOE/edit?ts=5ad78165#

Bug:  643346 
Change-Id: Ic9a9dcfae86aca730d35fbb26c26b21135e05bf3
Recipe-Nontrivial-Roll: skia
Recipe-Nontrivial-Roll: infra
Recipe-Nontrivial-Roll: build_limited_scripts_slave
Recipe-Nontrivial-Roll: skiabuildbot
Recipe-Nontrivial-Roll: build
Recipe-Nontrivial-Roll: release_scripts
Reviewed-on: https://chromium-review.googlesource.com/1014356
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_empty_revision.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle_deprecated.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name_no_patch.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/trychange.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/buildbot.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipes/fetch_end_to_end_test.expected/basic.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/basic.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/no_shallow.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/api.py
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
[modify] https://crrev.com/355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json

Project Member

Comment 94 by bugdroid1@chromium.org, Apr 25 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9ce0a24132b8f1ebd1b2b249f9938486607b15ad

commit 9ce0a24132b8f1ebd1b2b249f9938486607b15ad
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Wed Apr 25 00:35:18 2018

Roll src/third_party/depot_tools/ 2c9a04604..355b11a31 (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/2c9a04604fa3..355b11a31f0d

$ git log 2c9a04604..355b11a31 --date=short --no-merges --format='%ad %ae %s'
2018-04-16 ehmaldonado bot_update: Patch on gclient by default.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I77cbef26ba041a2bef9ab0c70eb80475c27e3433
Reviewed-on: https://chromium-review.googlesource.com/1026842
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#553390}
[modify] https://crrev.com/9ce0a24132b8f1ebd1b2b249f9938486607b15ad/DEPS

Project Member

Comment 95 by bugdroid1@chromium.org, Apr 26 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/2acf4957984643d8ac1a856afed0730c4449e190

commit 2acf4957984643d8ac1a856afed0730c4449e190
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Apr 26 00:46:58 2018

Revert "bot_update: Patch on gclient by default."

This reverts commit 355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d.

Reason for revert:
Easier to do this another way that doesn't cause expectation changes,
so it doesn't require non-trivial rolls.

Original change's description:
> bot_update: Patch on gclient by default.
> 
> See [4] for the design doc for this change.
> 
> We're moving the patching logic from bot_update to gclient.
> This way we can test patches of dependencies that modify their DEPS
> files as well, for example when ANGLE uploads a patch that modifies
> DEPS files to be tested by a Chromium trybot.
> 
> Chromium Linux CQ and Angle trybots are already running this way
> (see [1] and [2]) and a PSA has already been sent [3]
> 
> [1] https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/cr-buildbucket.cfg#214
> [2] https://chromium.googlesource.com/angle/angle/+/infra/config/cr-buildbucket.cfg#105
> [3] https://groups.google.com/a/google.com/forum/#!topic/chrome-infra/FVHN2kdUX4I
> [4] https://docs.google.com/document/d/1GSTw4ysm5AYjNR6vMA7NJUxLK2VN9IpOEp_v0u-wyOE/edit?ts=5ad78165#
> 
> Bug:  643346 
> Change-Id: Ic9a9dcfae86aca730d35fbb26c26b21135e05bf3
> Recipe-Nontrivial-Roll: skia
> Recipe-Nontrivial-Roll: infra
> Recipe-Nontrivial-Roll: build_limited_scripts_slave
> Recipe-Nontrivial-Roll: skiabuildbot
> Recipe-Nontrivial-Roll: build
> Recipe-Nontrivial-Roll: release_scripts
> Reviewed-on: https://chromium-review.googlesource.com/1014356
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>

TBR=agable@chromium.org,ehmaldonado@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug:  643346 
Change-Id: I0e694b0e398770b8bd2e5a3170e158a7e54c5a61
Reviewed-on: https://chromium-review.googlesource.com/1029310
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_empty_revision.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle_deprecated.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name_no_patch.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/trychange.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/buildbot.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipes/fetch_end_to_end_test.expected/basic.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/basic.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/no_shallow.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/api.py
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
[modify] https://crrev.com/2acf4957984643d8ac1a856afed0730c4449e190/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json

Project Member

Comment 96 by bugdroid1@chromium.org, Apr 26 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/47bc077cc80296bce3d4dcbc169bcc5ba2f8abc1

commit 47bc077cc80296bce3d4dcbc169bcc5ba2f8abc1
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Thu Apr 26 04:50:41 2018

Roll src/third_party/depot_tools/ 2f2142eff..2acf49579 (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/2f2142eff8c0..2acf49579846

$ git log 2f2142eff..2acf49579 --date=short --no-merges --format='%ad %ae %s'
2018-04-26 ehmaldonado Revert "bot_update: Patch on gclient by default."

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Id9901636e94a10f8218b33afa2579f93796c2c41
Reviewed-on: https://chromium-review.googlesource.com/1029351
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#553919}
[modify] https://crrev.com/47bc077cc80296bce3d4dcbc169bcc5ba2f8abc1/DEPS

Project Member

Comment 97 by bugdroid1@chromium.org, Apr 26 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/e38cf570fc8c0df53b576c179701efe6d683f7d2

commit e38cf570fc8c0df53b576c179701efe6d683f7d2
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Apr 26 17:47:37 2018

Reland "bot_update: Patch on gclient by default."

This is a reland of 355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d

Original change's description:
> bot_update: Patch on gclient by default.
> 
> See [4] for the design doc for this change.
> 
> We're moving the patching logic from bot_update to gclient.
> This way we can test patches of dependencies that modify their DEPS
> files as well, for example when ANGLE uploads a patch that modifies
> DEPS files to be tested by a Chromium trybot.
> 
> Chromium Linux CQ and Angle trybots are already running this way
> (see [1] and [2]) and a PSA has already been sent [3]
> 
> [1] https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/cr-buildbucket.cfg#214
> [2] https://chromium.googlesource.com/angle/angle/+/infra/config/cr-buildbucket.cfg#105
> [3] https://groups.google.com/a/google.com/forum/#!topic/chrome-infra/FVHN2kdUX4I
> [4] https://docs.google.com/document/d/1GSTw4ysm5AYjNR6vMA7NJUxLK2VN9IpOEp_v0u-wyOE/edit?ts=5ad78165#
> 
> Bug:  643346 
> Change-Id: Ic9a9dcfae86aca730d35fbb26c26b21135e05bf3
> Recipe-Nontrivial-Roll: skia
> Recipe-Nontrivial-Roll: infra
> Recipe-Nontrivial-Roll: build_limited_scripts_slave
> Recipe-Nontrivial-Roll: skiabuildbot
> Recipe-Nontrivial-Roll: build
> Recipe-Nontrivial-Roll: release_scripts
> Reviewed-on: https://chromium-review.googlesource.com/1014356
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>

Bug:  643346 
Change-Id: I2da17456f24d1e9fcc3f48f9242b4db05cadbf6d
Reviewed-on: https://chromium-review.googlesource.com/1029073
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[rename] https://crrev.com/e38cf570fc8c0df53b576c179701efe6d683f7d2/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
[modify] https://crrev.com/e38cf570fc8c0df53b576c179701efe6d683f7d2/recipes/recipe_modules/bot_update/examples/full.py
[modify] https://crrev.com/e38cf570fc8c0df53b576c179701efe6d683f7d2/recipes/recipe_modules/bot_update/resources/bot_update.py
[modify] https://crrev.com/e38cf570fc8c0df53b576c179701efe6d683f7d2/recipes/recipe_modules/bot_update/api.py

Project Member

Comment 98 by bugdroid1@chromium.org, Apr 26 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/990148ed24f058d28c3abc12eb9b3ef7ffc3c56e

commit 990148ed24f058d28c3abc12eb9b3ef7ffc3c56e
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Apr 26 19:03:17 2018

gclient: Fix logic to match --patch-ref with dependencies.

Accept cases when the origin in --patch-ref ends in .git but the URL in
.gclient or DEPS doesn't.

R=agable@chromium.org

Bug:  643346 
Change-Id: I25e6fd8400b09c7e249578cfbd7e9485bab9ea85
Reviewed-on: https://chromium-review.googlesource.com/1030893
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/990148ed24f058d28c3abc12eb9b3ef7ffc3c56e/gclient.py
[modify] https://crrev.com/990148ed24f058d28c3abc12eb9b3ef7ffc3c56e/recipes/trigger_recipe_roller.txt

Project Member

Comment 99 by bugdroid1@chromium.org, Apr 26 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5a3f59b5075e6f0993488d65dbf6e5b7c8b40898

commit 5a3f59b5075e6f0993488d65dbf6e5b7c8b40898
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Thu Apr 26 19:14:43 2018

Roll src/third_party/depot_tools/ 3cb0767ac..e38cf570f (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/3cb0767ac14e..e38cf570fc8c

$ git log 3cb0767ac..e38cf570f --date=short --no-merges --format='%ad %ae %s'
2018-04-25 ehmaldonado Reland "bot_update: Patch on gclient by default."

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I126e94438a950ff78725c5c11cbaca61cc122185
Reviewed-on: https://chromium-review.googlesource.com/1030713
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#554111}
[modify] https://crrev.com/5a3f59b5075e6f0993488d65dbf6e5b7c8b40898/DEPS

Project Member

Comment 100 by bugdroid1@chromium.org, Apr 26 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/7580f9dac98552b038f9644cf9712f09712c7858

commit 7580f9dac98552b038f9644cf9712f09712c7858
Author: Ben Pastene <bpastene@chromium.org>
Date: Thu Apr 26 19:15:08 2018

Revert "Reland "bot_update: Patch on gclient by default.""

This reverts commit e38cf570fc8c0df53b576c179701efe6d683f7d2.

Reason for revert: likely broke bot_update on win CQ bots:
https://ci.chromium.org/buildbot/tryserver.chromium.win/win7_chromium_rel_ng/154654
https://bugs.chromium.org/p/chromium/issues/detail?id=837321

Original change's description:
> Reland "bot_update: Patch on gclient by default."
> 
> This is a reland of 355b11a31f0d2bd2fcc4e14f8abc8681edbf3b2d
> 
> Original change's description:
> > bot_update: Patch on gclient by default.
> > 
> > See [4] for the design doc for this change.
> > 
> > We're moving the patching logic from bot_update to gclient.
> > This way we can test patches of dependencies that modify their DEPS
> > files as well, for example when ANGLE uploads a patch that modifies
> > DEPS files to be tested by a Chromium trybot.
> > 
> > Chromium Linux CQ and Angle trybots are already running this way
> > (see [1] and [2]) and a PSA has already been sent [3]
> > 
> > [1] https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/cr-buildbucket.cfg#214
> > [2] https://chromium.googlesource.com/angle/angle/+/infra/config/cr-buildbucket.cfg#105
> > [3] https://groups.google.com/a/google.com/forum/#!topic/chrome-infra/FVHN2kdUX4I
> > [4] https://docs.google.com/document/d/1GSTw4ysm5AYjNR6vMA7NJUxLK2VN9IpOEp_v0u-wyOE/edit?ts=5ad78165#
> > 
> > Bug:  643346 
> > Change-Id: Ic9a9dcfae86aca730d35fbb26c26b21135e05bf3
> > Recipe-Nontrivial-Roll: skia
> > Recipe-Nontrivial-Roll: infra
> > Recipe-Nontrivial-Roll: build_limited_scripts_slave
> > Recipe-Nontrivial-Roll: skiabuildbot
> > Recipe-Nontrivial-Roll: build
> > Recipe-Nontrivial-Roll: release_scripts
> > Reviewed-on: https://chromium-review.googlesource.com/1014356
> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> > Reviewed-by: Aaron Gable <agable@chromium.org>
> 
> Bug:  643346 
> Change-Id: I2da17456f24d1e9fcc3f48f9242b4db05cadbf6d
> Reviewed-on: https://chromium-review.googlesource.com/1029073
> Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

TBR=agable@chromium.org,tandrii@chromium.org,ehmaldonado@chromium.org

Change-Id: I33e4bf7b5f416f6356dbd0b50a276cd36dd4e9b3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  643346 
Reviewed-on: https://chromium-review.googlesource.com/1030718
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>

[modify] https://crrev.com/7580f9dac98552b038f9644cf9712f09712c7858/recipes/recipe_modules/bot_update/resources/bot_update.py
[rename] https://crrev.com/7580f9dac98552b038f9644cf9712f09712c7858/recipes/recipe_modules/bot_update/examples/full.expected/apply_patch_on_gclient.json
[modify] https://crrev.com/7580f9dac98552b038f9644cf9712f09712c7858/recipes/recipe_modules/bot_update/api.py
[modify] https://crrev.com/7580f9dac98552b038f9644cf9712f09712c7858/recipes/recipe_modules/bot_update/examples/full.py

Project Member

Comment 101 by bugdroid1@chromium.org, Apr 26 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/97ce05851cb5559459058706a69e81ddaed54f1e

commit 97ce05851cb5559459058706a69e81ddaed54f1e
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu Apr 26 22:12:04 2018

gclient_scm: Try to rebase after printing what was wrong.

So we know why did git fail on the Chromium Windows trybots.

R=agable@chromium.org

Bug:  643346 
Change-Id: Iac0abd9202fb56fbed6f3edf382b755e96fed3bf
Reviewed-on: https://chromium-review.googlesource.com/1031128
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/97ce05851cb5559459058706a69e81ddaed54f1e/gclient_scm.py
[modify] https://crrev.com/97ce05851cb5559459058706a69e81ddaed54f1e/recipes/trigger_recipe_roller.txt

Project Member

Comment 102 by bugdroid1@chromium.org, Apr 27 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a7d78d8f3ad98980a93312b4a86e71eb83e00fdb

commit a7d78d8f3ad98980a93312b4a86e71eb83e00fdb
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Fri Apr 27 00:14:35 2018

Roll src/third_party/depot_tools/ e38cf570f..7580f9dac (2 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/e38cf570fc8c..7580f9dac985

$ git log e38cf570f..7580f9dac --date=short --no-merges --format='%ad %ae %s'
2018-04-26 bpastene Revert "Reland "bot_update: Patch on gclient by default.""
2018-04-26 ehmaldonado gclient: Fix logic to match --patch-ref with dependencies.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 , chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Ib0d758dbf31ad2a15c40810dc48f960c69921935
Reviewed-on: https://chromium-review.googlesource.com/1030826
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#554208}
[modify] https://crrev.com/a7d78d8f3ad98980a93312b4a86e71eb83e00fdb/DEPS

Project Member

Comment 103 by bugdroid1@chromium.org, Apr 27 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/80461bb5dfb2a0ec957ba9f16824edb3979b4ac9

commit 80461bb5dfb2a0ec957ba9f16824edb3979b4ac9
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Fri Apr 27 01:43:16 2018

Roll src/third_party/depot_tools/ 7580f9dac..97ce05851 (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/7580f9dac985..97ce05851cb5

$ git log 7580f9dac..97ce05851 --date=short --no-merges --format='%ad %ae %s'
2018-04-26 ehmaldonado gclient_scm: Try to rebase after printing what was wrong.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I24f5a080110d98a7a1a2fd2ac93749153a2e14f9
Reviewed-on: https://chromium-review.googlesource.com/1031095
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#554260}
[modify] https://crrev.com/80461bb5dfb2a0ec957ba9f16824edb3979b4ac9/DEPS

Edward and Aaron, thanks a lot for your work on this. Let me know when it's ready for use. I tried this morning with this CL:

https://chromium-review.googlesource.com/c/angle/angle/+/1032693

This should fail on the dEQP bots from a broken compile. You can also look in the bot_update step. The additional argument to bot_update for these bots specified as --revision src/third_party/angle@HEAD may be a problem, not sure.
Project Member

Comment 105 by bugdroid1@chromium.org, Apr 30 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/e86fe982e811360b8e9dcb3688c543efd153fff4

commit e86fe982e811360b8e9dcb3688c543efd153fff4
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Mon Apr 30 22:42:08 2018

bot_update: Set user.{name,email} when applying patch refs.

git rebase complains when user name/email has not been configured, as was
the case for the Chromium trybot.

Bug:  643346 
Change-Id: Iab7dac0a98608e09b63a53d5bacb98925701fbfd
Reviewed-on: https://chromium-review.googlesource.com/1031524
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/e86fe982e811360b8e9dcb3688c543efd153fff4/recipes/recipe_modules/bot_update/resources/bot_update.py
[modify] https://crrev.com/e86fe982e811360b8e9dcb3688c543efd153fff4/recipes/trigger_recipe_roller.txt

Project Member

Comment 106 by bugdroid1@chromium.org, Apr 30 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/43d72759fed16f6666fa08efb54400ff7887fd9e

commit 43d72759fed16f6666fa08efb54400ff7887fd9e
Author: Stephen Martinis <martiniss@chromium.org>
Date: Mon Apr 30 23:00:38 2018

Revert "bot_update: Set user.{name,email} when applying patch refs."

This reverts commit e86fe982e811360b8e9dcb3688c543efd153fff4.

Reason for revert: Probably causing outages on win7_chromium_rel_ng.

Original change's description:
> bot_update: Set user.{name,email} when applying patch refs.
> 
> git rebase complains when user name/email has not been configured, as was
> the case for the Chromium trybot.
> 
> Bug:  643346 
> Change-Id: Iab7dac0a98608e09b63a53d5bacb98925701fbfd
> Reviewed-on: https://chromium-review.googlesource.com/1031524
> Reviewed-by: Aaron Gable <agable@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

TBR=agable@chromium.org,ehmaldonado@chromium.org

Change-Id: Ic57398323476fccef34f766270d760c3975630a6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  643346 
Reviewed-on: https://chromium-review.googlesource.com/1036308
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>

[modify] https://crrev.com/43d72759fed16f6666fa08efb54400ff7887fd9e/recipes/recipe_modules/bot_update/resources/bot_update.py
[modify] https://crrev.com/43d72759fed16f6666fa08efb54400ff7887fd9e/recipes/trigger_recipe_roller.txt

Project Member

Comment 107 by bugdroid1@chromium.org, May 1 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0e8310756f47dbe923e71c45e2458f9dc542e21d

commit 0e8310756f47dbe923e71c45e2458f9dc542e21d
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Tue May 01 03:00:03 2018

Roll src/third_party/depot_tools/ c6e57bb74..43d72759f (2 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/c6e57bb74838..43d72759fed1

$ git log c6e57bb74..43d72759f --date=short --no-merges --format='%ad %ae %s'
2018-04-30 martiniss Revert "bot_update: Set user.{name,email} when applying patch refs."
2018-04-30 ehmaldonado bot_update: Set user.{name,email} when applying patch refs.

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 , chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I6fbe98d45785db4cad8f26d9491697dabcc22e86
Reviewed-on: https://chromium-review.googlesource.com/1036542
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#554981}
[modify] https://crrev.com/0e8310756f47dbe923e71c45e2458f9dc542e21d/DEPS

Project Member

Comment 108 by bugdroid1@chromium.org, May 2 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/6c692edf010ce9e43737406c53f399b13631ac4f

commit 6c692edf010ce9e43737406c53f399b13631ac4f
Author: Edward Lemur <ehmaldonado@chromium.org>
Date: Wed May 02 16:37:27 2018

Reland "bot_update: Set user.{name,email} when applying patch refs."

This is a reland of e86fe982e811360b8e9dcb3688c543efd153fff4

Original change's description:
> bot_update: Set user.{name,email} when applying patch refs.
> 
> git rebase complains when user name/email has not been configured, as was
> the case for the Chromium trybot.
> 
> Bug:  643346 
> Change-Id: Iab7dac0a98608e09b63a53d5bacb98925701fbfd
> Reviewed-on: https://chromium-review.googlesource.com/1031524
> Reviewed-by: Aaron Gable <agable@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

Bug:  643346 
Change-Id: I4b4d07675222d39d704560ed84f9c221e87aba8b
Reviewed-on: https://chromium-review.googlesource.com/1036309
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/6c692edf010ce9e43737406c53f399b13631ac4f/recipes/recipe_modules/bot_update/resources/bot_update.py

Project Member

Comment 109 by bugdroid1@chromium.org, May 2 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/d190bb5dcd6c825cc41e970b6e411c2ca8eb4d0d

commit d190bb5dcd6c825cc41e970b6e411c2ca8eb4d0d
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Wed May 02 22:37:13 2018

Roll src/third_party/depot_tools/ 1037c743e..6c692edf0 (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/1037c743e338..6c692edf010c

$ git log 1037c743e..6c692edf0 --date=short --no-merges --format='%ad %ae %s'
2018-05-01 ehmaldonado Reland "bot_update: Set user.{name,email} when applying patch refs."

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Ieb31ccea1736d2f6164139b4fcc23d8c4042987c
Reviewed-on: https://chromium-review.googlesource.com/1040531
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#555582}
[modify] https://crrev.com/d190bb5dcd6c825cc41e970b6e411c2ca8eb4d0d/DEPS

Project Member

Comment 110 by bugdroid1@chromium.org, May 3 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/8f20428bf4dc574b138a63ae705b74af3945cdda

commit 8f20428bf4dc574b138a63ae705b74af3945cdda
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu May 03 21:43:06 2018

Reland "bot_update: Patch on gclient by default."

This is a reland of e38cf570fc8c0df53b576c179701efe6d683f7d2

The issue with win CQ bots was fixed in https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1036309
It was due to misconfigured git user.{name,email}

Original change's description:
> bot_update: Patch on gclient by default.
>
> See [4] for the design doc for this change.
>
> We're moving the patching logic from bot_update to gclient.
> This way we can test patches of dependencies that modify their DEPS
> files as well, for example when ANGLE uploads a patch that modifies
> DEPS files to be tested by a Chromium trybot.
>
> Chromium Linux CQ and Angle trybots are already running this way
> (see [1] and [2]) and a PSA has already been sent [3]
>
> [1] https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/cr-buildbucket.cfg#214
> [2] https://chromium.googlesource.com/angle/angle/+/infra/config/cr-buildbucket.cfg#105
> [3] https://groups.google.com/a/google.com/forum/#!topic/chrome-infra/FVHN2kdUX4I
> [4] https://docs.google.com/document/d/1GSTw4ysm5AYjNR6vMA7NJUxLK2VN9IpOEp_v0u-wyOE/edit?ts=5ad78165#
>
> Bug:  643346 
> Change-Id: Ic9a9dcfae86aca730d35fbb26c26b21135e05bf3
> Recipe-Nontrivial-Roll: skia
> Recipe-Nontrivial-Roll: infra
> Recipe-Nontrivial-Roll: build_limited_scripts_slave
> Recipe-Nontrivial-Roll: skiabuildbot
> Recipe-Nontrivial-Roll: build
> Recipe-Nontrivial-Roll: release_scripts
> Reviewed-on: https://chromium-review.googlesource.com/1014356
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>

Bug:  643346 
Change-Id: I4f4edd8e815cb12a4cbc3ab690eaf588bc2accc1
Reviewed-on: https://chromium-review.googlesource.com/1039966
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[rename] https://crrev.com/8f20428bf4dc574b138a63ae705b74af3945cdda/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
[modify] https://crrev.com/8f20428bf4dc574b138a63ae705b74af3945cdda/recipes/recipe_modules/bot_update/examples/full.py
[modify] https://crrev.com/8f20428bf4dc574b138a63ae705b74af3945cdda/recipes/recipe_modules/bot_update/resources/bot_update.py
[modify] https://crrev.com/8f20428bf4dc574b138a63ae705b74af3945cdda/recipes/recipe_modules/bot_update/api.py

Project Member

Comment 111 by bugdroid1@chromium.org, May 3 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/ea50265aefdf0a262fdf315c2f4193345f6cefca

commit ea50265aefdf0a262fdf315c2f4193345f6cefca
Author: Stephen Martinis <martiniss@chromium.org>
Date: Thu May 03 22:35:09 2018

Revert "Reland "bot_update: Patch on gclient by default.""

This reverts commit 8f20428bf4dc574b138a63ae705b74af3945cdda.

Reason for revert: Probably broke bot update on catapult bots: https://build.chromium.org/p/tryserver.client.catapult/builders/Catapult%20Linux%20Tryserver/builds/11225

Original change's description:
> Reland "bot_update: Patch on gclient by default."
> 
> This is a reland of e38cf570fc8c0df53b576c179701efe6d683f7d2
> 
> The issue with win CQ bots was fixed in https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1036309
> It was due to misconfigured git user.{name,email}
> 
> Original change's description:
> > bot_update: Patch on gclient by default.
> >
> > See [4] for the design doc for this change.
> >
> > We're moving the patching logic from bot_update to gclient.
> > This way we can test patches of dependencies that modify their DEPS
> > files as well, for example when ANGLE uploads a patch that modifies
> > DEPS files to be tested by a Chromium trybot.
> >
> > Chromium Linux CQ and Angle trybots are already running this way
> > (see [1] and [2]) and a PSA has already been sent [3]
> >
> > [1] https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/cr-buildbucket.cfg#214
> > [2] https://chromium.googlesource.com/angle/angle/+/infra/config/cr-buildbucket.cfg#105
> > [3] https://groups.google.com/a/google.com/forum/#!topic/chrome-infra/FVHN2kdUX4I
> > [4] https://docs.google.com/document/d/1GSTw4ysm5AYjNR6vMA7NJUxLK2VN9IpOEp_v0u-wyOE/edit?ts=5ad78165#
> >
> > Bug:  643346 
> > Change-Id: Ic9a9dcfae86aca730d35fbb26c26b21135e05bf3
> > Recipe-Nontrivial-Roll: skia
> > Recipe-Nontrivial-Roll: infra
> > Recipe-Nontrivial-Roll: build_limited_scripts_slave
> > Recipe-Nontrivial-Roll: skiabuildbot
> > Recipe-Nontrivial-Roll: build
> > Recipe-Nontrivial-Roll: release_scripts
> > Reviewed-on: https://chromium-review.googlesource.com/1014356
> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> > Reviewed-by: Aaron Gable <agable@chromium.org>
> 
> Bug:  643346 
> Change-Id: I4f4edd8e815cb12a4cbc3ab690eaf588bc2accc1
> Reviewed-on: https://chromium-review.googlesource.com/1039966
> Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

TBR=agable@chromium.org,tandrii@chromium.org,ehmaldonado@chromium.org

Change-Id: Ia8a5779cde3c31812121cffdd806476d4536f35e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  643346 
Reviewed-on: https://chromium-review.googlesource.com/1043167
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>

[modify] https://crrev.com/ea50265aefdf0a262fdf315c2f4193345f6cefca/recipes/recipe_modules/bot_update/resources/bot_update.py
[rename] https://crrev.com/ea50265aefdf0a262fdf315c2f4193345f6cefca/recipes/recipe_modules/bot_update/examples/full.expected/apply_patch_on_gclient.json
[modify] https://crrev.com/ea50265aefdf0a262fdf315c2f4193345f6cefca/recipes/recipe_modules/bot_update/api.py
[modify] https://crrev.com/ea50265aefdf0a262fdf315c2f4193345f6cefca/recipes/recipe_modules/bot_update/examples/full.py

Project Member

Comment 112 by bugdroid1@chromium.org, May 4 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/31397fbce35a7dd005132afcd725e1baa027bb0f

commit 31397fbce35a7dd005132afcd725e1baa027bb0f
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Fri May 04 00:54:39 2018

Roll src/third_party/depot_tools/ 6c692edf0..8f20428bf (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/6c692edf010c..8f20428bf4dc

$ git log 6c692edf0..8f20428bf --date=short --no-merges --format='%ad %ae %s'
2018-04-25 ehmaldonado Reland "bot_update: Patch on gclient by default."

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: If1aeb8f42c55a23a9fc1f92555fe37b794373fa4
Reviewed-on: https://chromium-review.googlesource.com/1043154
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#555937}
[modify] https://crrev.com/31397fbce35a7dd005132afcd725e1baa027bb0f/DEPS

Project Member

Comment 113 by bugdroid1@chromium.org, May 4 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b1b96e07b5643bd3c41fcded9f2b036bdde766a7

commit b1b96e07b5643bd3c41fcded9f2b036bdde766a7
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Fri May 04 02:06:19 2018

Roll src/third_party/depot_tools/ 8f20428bf..848c86e3e (2 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/8f20428bf4dc..848c86e3e858

$ git log 8f20428bf..848c86e3e --date=short --no-merges --format='%ad %ae %s'
2018-05-03 mmoss Make 'gclient_gn_args*' handling consistent between sync and flatten.
2018-05-03 martiniss Revert "Reland "bot_update: Patch on gclient by default.""

Created with:
  roll-dep src/third_party/depot_tools
BUG=chromium:825063, chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I38178ecfae2023a5ade41d0f584905010540cafb
Reviewed-on: https://chromium-review.googlesource.com/1043461
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#555960}
[modify] https://crrev.com/b1b96e07b5643bd3c41fcded9f2b036bdde766a7/DEPS

Project Member

Comment 114 by bugdroid1@chromium.org, May 4 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b105d6f6ac7730607488e1628cf1ddc50541c62c

commit b105d6f6ac7730607488e1628cf1ddc50541c62c
Author: Edward Lemur <ehmaldonado@chromium.org>
Date: Fri May 04 20:07:19 2018

[cr-buildbucket.cfg] Add experimental bots on win and mac to test patching on gclient

This adds {win,mac}_chromium_compile_dbg_ng_patch_on_gclient to make sure that
patching on gclient works as expected.

Bug:  643346 
Change-Id: Ife7cb26c1b699be50d85f5e629824e7f205781cd
Reviewed-on: https://chromium-review.googlesource.com/1043345
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556165}
[modify] https://crrev.com/b105d6f6ac7730607488e1628cf1ddc50541c62c/infra/config/branch/cq.cfg
[modify] https://crrev.com/b105d6f6ac7730607488e1628cf1ddc50541c62c/infra/config/global/cr-buildbucket.cfg

Project Member

Comment 115 by bugdroid1@chromium.org, May 4 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/ea240053f95686277bd86700d7a1209dc09474f4

commit ea240053f95686277bd86700d7a1209dc09474f4
Author: Edward Lemur <ehmaldonado@chromium.org>
Date: Fri May 04 21:23:16 2018

gclient: Update catapult and custom-tab-client origin URLs

Otherwise, the origin URLs for the checkout and the patch won't match
and applying the patch on gclient will fail.

Bug:  643346 
Change-Id: If005bb10e579b3d50f9b6d0ff39440bb9a300cbd
Recipe-Nontrivial-Roll: build
Recipe-Nontrivial-Roll: build_limited
Recipe-Nontrivial-Roll: build_limited_scripts_slave
Reviewed-on: https://chromium-review.googlesource.com/1043254
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/ea240053f95686277bd86700d7a1209dc09474f4/recipes/recipe_modules/gclient/config.py

Project Member

Comment 116 by bugdroid1@chromium.org, May 4 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/build/+/098d68962361f3cf26829be4ba8299b26ab7a4d6

commit 098d68962361f3cf26829be4ba8299b26ab7a4d6
Author: Edward Lemur <ehmaldonado@chromium.org>
Date: Fri May 04 21:53:59 2018

syzygy: Change the origin url in the gclient config.

The source of truth has moved, and checking out the old repo
while getting patches from the new one will cause patch problems.

Bug:  643346 
Change-Id: Ic4ac4a37b0d4f59c55dc5ae93ce771fb0346e2d0
Reviewed-on: https://chromium-review.googlesource.com/1043355
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win_x64_rel_try.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_Syzygy_Official.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/coverage.expected/full_master_client_syzygy_win_cov_try.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/kasko_official.expected/full_master_client_syzygy_Kasko_Official.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win_dbg_try.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipe_modules/syzygy/gclient_config.py
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipe_modules/syzygy/examples/full.expected/full_master_client_syzygy_Syzygy_Debug.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win_x64_dbg_try.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipe_modules/syzygy/examples/full.expected/full_master_client_syzygy_Syzygy_Official.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_Syzygy_Release.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win_rel_try.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win_official_try.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/coverage.expected/full_master_client_syzygy_Syzygy_Coverage.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipe_modules/syzygy/examples/full.expected/full_master_client_syzygy_Syzygy_Coverage.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_win8_rel_try.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/smoke_test.expected/full_master_client_syzygy_Syzygy_Smoke_Test.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_Syzygy_Debug.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_Syzygy_Release_x64.json
[modify] https://crrev.com/098d68962361f3cf26829be4ba8299b26ab7a4d6/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_Syzygy_Debug_x64.json

Project Member

Comment 117 by bugdroid1@chromium.org, May 5 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/4fd8a827a8b9c51cbedce4060ee7b841edeee3c5

commit 4fd8a827a8b9c51cbedce4060ee7b841edeee3c5
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Sat May 05 01:25:50 2018

Roll src/third_party/depot_tools/ 142a92ce8..ea240053f (1 commit)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/142a92ce8b83..ea240053f956

$ git log 142a92ce8..ea240053f --date=short --no-merges --format='%ad %ae %s'
2018-05-03 ehmaldonado gclient: Update catapult and custom-tab-client origin URLs

Created with:
  roll-dep src/third_party/depot_tools
BUG= chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: Id2fd9f19897a69cab6d2cece4526c9f1aa126291
Reviewed-on: https://chromium-review.googlesource.com/1045182
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#556287}
[modify] https://crrev.com/4fd8a827a8b9c51cbedce4060ee7b841edeee3c5/DEPS

Project Member

Comment 118 by bugdroid1@chromium.org, May 9 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/d1674d5d8c53f5a9c6a57a1a3bb4222d12914327

commit d1674d5d8c53f5a9c6a57a1a3bb4222d12914327
Author: Edward Lemur <ehmaldonado@chromium.org>
Date: Wed May 09 17:20:29 2018

cr-buildbucket.cfg: Apply patch on gclient on Chromium LUCI bots.

LUCI Chromium Trybots seem to work fine with the change. This will
unblock ANGLE and other projects that might want to test their
changes with Chromium, which is the main use case.

Bug:  643346 
Change-Id: I1649fda2773e4346cf48bdc6b364fe884a0e4e5e
Reviewed-on: https://chromium-review.googlesource.com/1050802
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557226}
[modify] https://crrev.com/d1674d5d8c53f5a9c6a57a1a3bb4222d12914327/infra/config/branch/cq.cfg
[modify] https://crrev.com/d1674d5d8c53f5a9c6a57a1a3bb4222d12914327/infra/config/global/cr-buildbucket.cfg

Hi :)

I believe this should be working for ANGLE trybots (and all Chromium trybots).
Have you tried it?
Cc: tobine@google.com
Thanks very much for fixing this! I was waiting for a change I made to be merged into our upstream dEQP repo before trying a new roll. CC'ing Tobin who is helping maintain the Vulkan Layers in ANGLE, maybe we can do a roll of the Vulkan LVL to test the new feature.
ehmaldonado: I can confirm this is working as expected. We ran a try job on an unlanded roll CQ in ANGLE and it correctly caught compile errors:

https://chromium-review.googlesource.com/c/angle/angle/+/1062066

This will be a huge time server for us when rolling dependencies in ANGLE. It should prevent the build breaks we've seen when rolling dependencies into Chrome as well. Big thanks to you and the infra folks for making time to fix this.
Project Member

Comment 122 by bugdroid1@chromium.org, May 16 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/3f0591d4f12991ed39bae2dca96d3593879be382

commit 3f0591d4f12991ed39bae2dca96d3593879be382
Author: Edward Lesmes <ehmaldonado@chromium.org>
Date: Wed May 16 20:01:11 2018

Reland "bot_update: Patch on gclient by default."

This is a reland of e38cf570fc8c0df53b576c179701efe6d683f7d2

Sinc the last reland catapult, custom-tab-client and syzygy had their origins updated
to the source of truth:
https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1043254
https://chromium-review.googlesource.com/c/chromium/tools/build/+/1043355

This fixes the last problem we had, where the origin in gclient was different from the
source of truth, and so the patch couldn't be applied.

Original change's description:
> bot_update: Patch on gclient by default.
>
> See [4] for the design doc for this change.
>
> We're moving the patching logic from bot_update to gclient.
> This way we can test patches of dependencies that modify their DEPS
> files as well, for example when ANGLE uploads a patch that modifies
> DEPS files to be tested by a Chromium trybot.
>
> Chromium Linux CQ and Angle trybots are already running this way
> (see [1] and [2]) and a PSA has already been sent [3]
>
> [1] https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/cr-buildbucket.cfg#214
> [2] https://chromium.googlesource.com/angle/angle/+/infra/config/cr-buildbucket.cfg#105
> [3] https://groups.google.com/a/google.com/forum/#!topic/chrome-infra/FVHN2kdUX4I
> [4] https://docs.google.com/document/d/1GSTw4ysm5AYjNR6vMA7NJUxLK2VN9IpOEp_v0u-wyOE/edit?ts=5ad78165#
>
> Bug:  643346 
> Change-Id: Ic9a9dcfae86aca730d35fbb26c26b21135e05bf3
> Recipe-Nontrivial-Roll: skia
> Recipe-Nontrivial-Roll: infra
> Recipe-Nontrivial-Roll: build_limited_scripts_slave
> Recipe-Nontrivial-Roll: skiabuildbot
> Recipe-Nontrivial-Roll: build
> Recipe-Nontrivial-Roll: release_scripts
> Reviewed-on: https://chromium-review.googlesource.com/1014356
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>

Bug:  643346 

Change-Id: Ia0db591c6bf9695f56e6b71777c567595986a511
Reviewed-on: https://chromium-review.googlesource.com/1031206
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[rename] https://crrev.com/3f0591d4f12991ed39bae2dca96d3593879be382/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
[modify] https://crrev.com/3f0591d4f12991ed39bae2dca96d3593879be382/recipes/recipe_modules/bot_update/examples/full.py
[modify] https://crrev.com/3f0591d4f12991ed39bae2dca96d3593879be382/recipes/recipe_modules/bot_update/resources/bot_update.py
[modify] https://crrev.com/3f0591d4f12991ed39bae2dca96d3593879be382/recipes/recipe_modules/bot_update/api.py

Glad to help :)
Please let me know if you need anything else.

I'll leave this bug open until I've enabled it for all bots, not only ANGLE and Chromium ones.
Project Member

Comment 124 by bugdroid1@chromium.org, May 16 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/f546c27ece7f2e321716e4f4293f20882235995f

commit f546c27ece7f2e321716e4f4293f20882235995f
Author: depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Wed May 16 23:25:16 2018

Roll src/third_party/depot_tools/ 8de3800ce..ed1bb34fc (3 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/8de3800ce55b..ed1bb34fc59e

$ git log 8de3800ce..ed1bb34fc --date=short --no-merges --format='%ad %ae %s'
2018-05-16 ehmaldonado gclient: Remove condition_value.
2018-05-16 ehmaldonado gclient: Merge hook_os with hooks and deps_os with os.
2018-04-26 ehmaldonado Reland "bot_update: Patch on gclient by default."

Created with:
  roll-dep src/third_party/depot_tools
BUG=chromium:839925,chromium:839925, chromium:643346 


The AutoRoll server is located here: https://depot-tools-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


TBR=agable@chromium.org

Change-Id: I593c53bdc762894bd3c7bdf61337327f4e2763f9
Reviewed-on: https://chromium-review.googlesource.com/1062929
Reviewed-by: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#559329}
[modify] https://crrev.com/f546c27ece7f2e321716e4f4293f20882235995f/DEPS

Status: Fixed (was: Started)
Showing comments 26 - 125 of 125 Older

Sign in to add a comment