New issue
Advanced search Search tips

Issue 814312 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Feb 2018
Cc:
EstimatedDays: ----
NextAction: ----
OS: Windows
Pri: 3
Type: Bug

Blocking:
issue 813519



Sign in to add a comment

tools/clang/scrips/upload_revision.py no longer works?

Project Member Reported by thakis@chromium.org, Feb 21 2018

Issue description

$ tools/clang/scripts/upload_revision.py 325667
Making a patch for Clang revision r325667-1
Chrome revision: 5c5ac6d12df3471eae76c0fd53f61157f7247678
M       tools/clang/scripts/update.py
Switched to a new branch 'clang-325667-1'
[clang-325667-1 ded0ef2896c2] Roll clang 324578:325667.
 1 file changed, 1 insertion(+), 1 deletion(-)
Running presubmit upload checks ...

Presubmit checks took 1.5s to calculate.

Presubmit checks passed.
 tools/clang/scripts/update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
remote: Processing changes: new: 1, done            
remote: 
remote: New Changes:        
remote:   https://chromium-review.googlesource.com/#/c/chromium/src/+/928682 Roll clang 324578:325667. [WIP]        
remote: 
To https://chromium.googlesource.com/chromium/src.git
 * [new branch]                31004b9cd65f3ba35f7138737521025a4d95721d -> refs/for/refs/heads/master%wip,m=Initial_upload,hashtag=roll-clang-324578

Usage: git cl try [options]

git cl: error: Tryserver master cannot be found because: No matching bucket for builder linux_upload_clang.
Please manually specify the tryserver master, e.g. "-m tryserver.chromium.linux".
Traceback (most recent call last):
  File "tools/clang/scripts/upload_revision.py", line 84, in <module>
    sys.exit(main())
  File "tools/clang/scripts/upload_revision.py", line 76, in main
    Git(["cl", "try", "-b", "linux_upload_clang", "-r", git_revision])
  File "tools/clang/scripts/upload_revision.py", line 44, in Git
    subprocess.check_call(["git"] + args, shell=is_win)
  File "/usr/lib/python2.7/subprocess.py", line 186, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'cl', 'try', '-b', 'linux_upload_clang', '-r', '5c5ac6d12df3471eae76c0fd53f61157f7247678']' returned non-zero exit status 2



This used to work less than 2 weeks ago...
 

Comment 1 by thakis@chromium.org, Feb 21 2018

Cc: no...@chromium.org
maybe https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/885100 broke this?

Comment 3 by thakis@chromium.org, Feb 21 2018

Blocking: 813519
Project Member

Comment 4 by bugdroid1@chromium.org, Feb 21 2018

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

commit 28848edcf3e39e3141e478d329201540f1299ecc
Author: Nico Weber <thakis@chromium.org>
Date: Wed Feb 21 14:28:33 2018

Attempt to fix upload_revision.py after changes on  crbug.com/800355 .

Sending the upload tryjobs started failing with this error:

"""
Usage: git cl try [options]

git cl: error: Tryserver master cannot be found because: No matching bucket for builder linux_upload_clang.
Please manually specify the tryserver master, e.g. "-m tryserver.chromium.linux".
"""

This change adds the `-m` flags that the error message asks for.

Bug:  814312 
Change-Id: I2f65de9a6f348dc7ba86c6de56c0ff5a9d48aef5
Reviewed-on: https://chromium-review.googlesource.com/928663
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#538095}
[modify] https://crrev.com/28848edcf3e39e3141e478d329201540f1299ecc/tools/clang/scripts/upload_revision.py

Comment 5 by thakis@chromium.org, Feb 21 2018

Status: Fixed (was: Assigned)
This helped:

$ tools/clang/scripts/upload_revision.py 325657
Making a patch for Clang revision r325657-1
Chrome revision: 178b96dd402dec6b8926d18a5394cc6f02bb7258
M       tools/clang/scripts/update.py
Switched to a new branch 'clang-325657-1'
[clang-325657-1 2129d788fd82] Roll clang 324578:325657.
 1 file changed, 1 insertion(+), 1 deletion(-)
Running presubmit upload checks ...

Presubmit checks took 1.5s to calculate.

Presubmit checks passed.
 tools/clang/scripts/update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
remote: Processing changes: new: 1, done            
remote: 
remote: New Changes:        
remote:   https://chromium-review.googlesource.com/#/c/chromium/src/+/928683 Roll clang 324578:325657. [WIP]        
remote: 
To https://chromium.googlesource.com/chromium/src.git
 * [new branch]                293d7a9f7145138ffb8ad244d1c674b017bfd5db -> refs/for/refs/heads/master%wip,m=Initial_upload,hashtag=roll-clang-324578

Tried jobs on:
Bucket: master.tryserver.chromium.linux
  linux_upload_clang: []
To see results here, run:        git cl try-results
To see results in browser, run:  git cl web
Tried jobs on:
Bucket: master.tryserver.chromium.mac
  mac_upload_clang: []
To see results here, run:        git cl try-results
To see results in browser, run:  git cl web
Tried jobs on:
Bucket: master.tryserver.chromium.win
  win_upload_clang: []
To see results here, run:        git cl try-results
To see results in browser, run:  git cl web
Please, wait until the try bots succeeded and then push the binaries to goma.

Comment 6 by no...@chromium.org, Feb 21 2018

sorry for the breakage.

Looks like upload_revision.py uses whatever version of git_cl.py that is present in $PATH. Do you manually update git_cl.py or do you use the one DEPSed in src.git?' Does the script work with latest version of depot_tools without your patch?

Comment 7 by thakis@chromium.org, Feb 21 2018

That script is run locally by a dev, who has depot_tools in their path, which auto-updates (or is supposed to).

...hmm but looks like my depot_tools is stuck on Feb 15, 6 days ago for some reason? Running `gclient` explicitly again updated it. Maybe I haven't run `gclient` on this box in 6 days?

Comment 8 by thakis@chromium.org, Feb 21 2018

Cc: h...@chromium.org
If I reset my src.git to before my change and try again with head depot_tools, it works:

$ tools/clang/scripts/upload_revision.py 325647
Making a patch for Clang revision r325647-1
Chrome revision: 178b96dd402dec6b8926d18a5394cc6f02bb7258
M       tools/clang/scripts/update.py
Switched to a new branch 'clang-325647-1'
[clang-325647-1 6beb135dfaf6] Roll clang 324578:325647.
 1 file changed, 1 insertion(+), 1 deletion(-)
Running presubmit upload checks ...

Presubmit checks took 1.6s to calculate.

Presubmit checks passed.
 tools/clang/scripts/update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
remote: Processing changes: new: 1, done            
remote: 
remote: New Changes:        
remote:   https://chromium-review.googlesource.com/#/c/chromium/src/+/928849 Roll clang 324578:325647. [WIP]        
remote: 
To https://chromium.googlesource.com/chromium/src.git
 * [new branch]                07f978b49752bac3778c42aa293a6152507815f3 -> refs/for/refs/heads/master%wip,m=Initial_upload,hashtag=roll-clang-324578

Tried jobs on:
Bucket: master.tryserver.chromium.linux
  linux_upload_clang: []
To see results here, run:        git cl try-results
To see results in browser, run:  git cl web
Tried jobs on:
Bucket: master.tryserver.chromium.mac
  mac_upload_clang: []
To see results here, run:        git cl try-results
To see results in browser, run:  git cl web
Tried jobs on:
Bucket: master.tryserver.chromium.win
  win_upload_clang: []
To see results here, run:        git cl try-results
To see results in browser, run:  git cl web
Please, wait until the try bots succeeded and then push the binaries to goma.


So I suppose this was user error. Should we revert the CL adding the -m flags?

Comment 9 by no...@chromium.org, Feb 21 2018

yes, please, with a reference to  bug 814360 
Project Member

Comment 10 by bugdroid1@chromium.org, Feb 21 2018

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

commit 8803e02e8b29fac4459e256b69afd47866c57e0e
Author: Nico Weber <thakis@chromium.org>
Date: Wed Feb 21 17:05:02 2018

Revert "Attempt to fix upload_revision.py after changes on  crbug.com/800355 ."

This reverts commit 28848edcf3e39e3141e478d329201540f1299ecc.

Reason for revert: This seems to be unnecessary with an up-to-date depot_tools, and the change makes other things harder ( crbug.com/814360 ).

Original change's description:
> Attempt to fix upload_revision.py after changes on  crbug.com/800355 .
> 
> Sending the upload tryjobs started failing with this error:
> 
> """
> Usage: git cl try [options]
> 
> git cl: error: Tryserver master cannot be found because: No matching bucket for builder linux_upload_clang.
> Please manually specify the tryserver master, e.g. "-m tryserver.chromium.linux".
> """
> 
> This change adds the `-m` flags that the error message asks for.
> 
> Bug:  814312 
> Change-Id: I2f65de9a6f348dc7ba86c6de56c0ff5a9d48aef5
> Reviewed-on: https://chromium-review.googlesource.com/928663
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Reviewed-by: Hans Wennborg <hans@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#538095}

TBR=thakis@chromium.org,hans@chromium.org,nodir@chromium.org

Change-Id: I4e5f0964bbfb17ff690ab6b207c0c5671716c5d0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  814312 
Reviewed-on: https://chromium-review.googlesource.com/928862
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#538138}
[modify] https://crrev.com/8803e02e8b29fac4459e256b69afd47866c57e0e/tools/clang/scripts/upload_revision.py

Sign in to add a comment