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

Issue 860397 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Jul 5
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 1
Type: Bug



Sign in to add a comment

sync_submodules should ignore CIPD deps

Project Member Reported by j...@chromium.org, Jul 5

Issue description

sync_submodules is currently broken because it tries to run git commands on a CIPD repo: https://build.chromium.org/deprecated/chromium.infra.codesearch/builders/codesearch-submodules-chromium/builds/43747/steps/deps2submodules/logs/stdio

=====================
subprocess.CalledProcessError: Command '['git', 'ls-remote', u'https://chrome-infra-packages.appspot.com/chromium/afdo/profiles/android', u'version:3309']' returned non-zero exit status 128
=====================

We shouldn't be calling git ls-remote on a CIPD url.
 
Project Member

Comment 1 by bugdroid1@chromium.org, Jul 5

The following revision refers to this bug:
  https://chromium.googlesource.com/infra/infra/+/2f10d8cf92319a891be478fb8fc45135461d023c

commit 2f10d8cf92319a891be478fb8fc45135461d023c
Author: Joey Scarr <jsca@google.com>
Date: Thu Jul 05 05:11:52 2018

Skip CIPD URLs in deps2submodules.

This should hopefully solve some issues we've been seeing with the CS
submodule builders where they've been trying to check out things from
CIPD as if they were git repos.

TBR=agable@chromium.org

Bug:  860397 , 860239 
Change-Id: I3040f78c3cfd8d0a8eeeeb3a5a7175b65b044cb4
Reviewed-on: https://chromium-review.googlesource.com/1126693
Reviewed-by: Joey Scarr <jsca@chromium.org>
Commit-Queue: Joey Scarr <jsca@chromium.org>

[modify] https://crrev.com/2f10d8cf92319a891be478fb8fc45135461d023c/recipes/recipe_modules/sync_submodules/resources/deps2submodules.py

Status: Fixed (was: Started)
Project Member

Comment 3 by bugdroid1@chromium.org, Jul 15

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

commit 8d3925b164822e2660d3b985402a5681432b0285
Author: Joey Scarr <jsca@google.com>
Date: Sun Jul 15 23:36:25 2018

Add support to gclient for skipping CIPD deps.

I want to use this in the Codesearch builder to replace the hack in
crrev.com/c/1126693.

Bug:  860397 
Change-Id: I174a684cbff0f993b5c657bc2e32105cb49d253a
Reviewed-on: https://chromium-review.googlesource.com/1132266
Commit-Queue: Joey Scarr <jsca@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>

[modify] https://crrev.com/8d3925b164822e2660d3b985402a5681432b0285/tests/gclient_test.py
[modify] https://crrev.com/8d3925b164822e2660d3b985402a5681432b0285/gclient.py

Project Member

Comment 4 by bugdroid1@chromium.org, Jul 15

The following revision refers to this bug:
  https://chromium.googlesource.com/infra/infra/+/2787140ed4c5b4d264d88f79b452881435ba6c55

commit 2787140ed4c5b4d264d88f79b452881435ba6c55
Author: Joey Scarr <jsca@google.com>
Date: Sun Jul 15 23:55:26 2018

Use --ignore-dep-type=cipd in sync_submodules.

Also remove 'version:' check in deps2submodules.

I'll only land this after support for this flag has been added to gclient in
crrev.com/c/1132266.

Bug:  860397 
Change-Id: If4e2e3febe55510febcf50c8796beee7c393ffa8
Reviewed-on: https://chromium-review.googlesource.com/1134628
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Joey Scarr <jsca@chromium.org>

[modify] https://crrev.com/2787140ed4c5b4d264d88f79b452881435ba6c55/recipes/recipes/sync_submodules.expected/basic_with_prefix.json
[modify] https://crrev.com/2787140ed4c5b4d264d88f79b452881435ba6c55/recipes/recipe_modules/sync_submodules/api.py
[modify] https://crrev.com/2787140ed4c5b4d264d88f79b452881435ba6c55/recipes/recipes/sync_submodules.expected/basic_with_diff.json
[modify] https://crrev.com/2787140ed4c5b4d264d88f79b452881435ba6c55/recipes/recipes/sync_submodules.expected/basic_with_diff_failure.json
[modify] https://crrev.com/2787140ed4c5b4d264d88f79b452881435ba6c55/recipes/recipes/sync_submodules.expected/basic_experimental.json
[modify] https://crrev.com/2787140ed4c5b4d264d88f79b452881435ba6c55/recipes/recipe_modules/sync_submodules/resources/deps2submodules.py
[modify] https://crrev.com/2787140ed4c5b4d264d88f79b452881435ba6c55/recipes/recipes/sync_submodules.expected/with_one_extra_submodule.json
[modify] https://crrev.com/2787140ed4c5b4d264d88f79b452881435ba6c55/recipes/recipes/sync_submodules.expected/basic.json
[modify] https://crrev.com/2787140ed4c5b4d264d88f79b452881435ba6c55/recipes/recipes/sync_submodules.expected/with_two_extra_submodules.json
[modify] https://crrev.com/2787140ed4c5b4d264d88f79b452881435ba6c55/recipes/recipes/sync_submodules.expected/basic_with_prefix_disabled.json

Project Member

Comment 5 by bugdroid1@chromium.org, Jul 16

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

commit 0cc3df82dc3b353b8b13f114c5af1453958fcca3
Author: depot-tools-chromium-autoroll <depot-tools-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Date: Mon Jul 16 01:57:10 2018

Roll src/third_party/depot_tools 2f38df65f95e..8d3925b16482 (1 commits)

https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/2f38df65f95e..8d3925b16482


git log 2f38df65f95e..8d3925b16482 --date=short --no-merges --format='%ad %ae %s'
2018-07-15 jsca@google.com Add support to gclient for skipping CIPD deps.


Created with:
  gclient setdep -r src/third_party/depot_tools@8d3925b16482

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.



BUG= chromium:860397 
TBR=agable@chromium.org

Change-Id: Id37d965f428f69448cd4cd0ed01953f39a94e138
Reviewed-on: https://chromium-review.googlesource.com/1137782
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@{#575195}
[modify] https://crrev.com/0cc3df82dc3b353b8b13f114c5af1453958fcca3/DEPS

Sign in to add a comment