New issue
Advanced search Search tips

Issue 642493 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Dec 2016
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 1
Type: Feature

Blocked on:
issue 672043

Blocking:
issue 626103



Sign in to add a comment

Commit position footer generation in Rieveld's CQ and git cl land

Project Member Reported by tandrii@chromium.org, Aug 30 2016

Issue description

See go/GNumGP. Same functionality as Gerrit Plugin: commit position footer generation ( issue 642484 ) but for CLs being landed through Rietveld by git cl land.
 
Blocking: 626103
Labels: -Restrict-View-Google
Labels: Pri-1 Type-Feature
Labels: Proj-Gerrit-Migration
Project Member

Comment 5 by bugdroid1@chromium.org, Sep 14 2016

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

commit f46c20fcee6e6a0a7d75788847632cd4ac18e2e9
Author: tandrii <tandrii@chromium.org>
Date: Wed Sep 14 13:17:05 2016

codereview.settings: add GIT_NUMBER_FOOTER setting.

This will be used in repositories that use Cr-Commit-Position footers
to generate them at the time of git cl land instead of gnumbd.

R=iannucci@chromium.org
BUG= 642493 

Review-Url: https://codereview.chromium.org/2324583002

[modify] https://crrev.com/f46c20fcee6e6a0a7d75788847632cd4ac18e2e9/git_cl.py

Project Member

Comment 6 by bugdroid1@chromium.org, Sep 14 2016

Project Member

Comment 7 by bugdroid1@chromium.org, Sep 14 2016

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

commit ba9de887ec268453298caa8641de3cc91dbfb818
Author: recipe-roller <recipe-roller@chromium.org>
Date: Wed Sep 14 23:34:35 2016

Roll recipe dependencies (trivial).

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

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

depot_tools:
  https://crrev.com/f46c20fcee6e6a0a7d75788847632cd4ac18e2e9 codereview.settings: add GIT_NUMBER_FOOTER setting. (tandrii@chromium.org)
  https://crrev.com/5d0a0421ce27046c94177511a05699316ec8097a git_cl: update outdated TODOs. (tandrii@chromium.org)
  https://crrev.com/73449b0bd49eab1e152f419102123d734896da98 Gerrit git cl land: abort if not uploaded. (tandrii@chromium.org)
  https://crrev.com/bf42940536f6c0c123a9e6278c20bc38729b3717 git cl land to refs/pending: remove unused arg. (tandrii@chromium.org)
  https://crrev.com/7475196d4c32d66e1c199bf24945b7ae28255e13 repo: update to v1.12.17-cr1 (vapier@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org
BUG= 642493 , chromium:632203 , 609225 ,642759

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2341613004

[modify] https://crrev.com/ba9de887ec268453298caa8641de3cc91dbfb818/infra/config/recipes.cfg

Project Member

Comment 8 by bugdroid1@chromium.org, Sep 15 2016

Project Member

Comment 9 by bugdroid1@chromium.org, Sep 16 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/infra/infra.git/+/7d6811c4c58a9e280bca7bf65a8dfde001bef42a

commit 7d6811c4c58a9e280bca7bf65a8dfde001bef42a
Author: recipe-roller <recipe-roller@chromium.org>
Date: Fri Sep 16 23:37:07 2016

Roll recipe dependencies (trivial).

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

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

build:
  https://crrev.com/ba9de887ec268453298caa8641de3cc91dbfb818 Roll recipe dependencies (trivial). (recipe-roller@chromium.org)
  https://crrev.com/e1d15cd7795cc1c5465983af8a49669242857107 Add rtc_stats_unittests to the test suite (ehmaldonado@chromium.org)
  https://crrev.com/37294244d9d54d639a083d382da68c50f8fe14e5 Add linux_chromium_headless_dbg trybot (perezju@chromium.org)
  https://crrev.com/f0f4c4a27746dee8a53234f03e452dba556deb55 Reland of Enable the ninja up-to-date check for Android builders (agrieve@chromium.org)
  https://crrev.com/2744734cf3aa1d8a02d0f0b7abf99635e9f2aa48 Revert of Enable the ninja up-to-date check for Android builders (patchset #1 id:1 of https://codereview.chromium.org/2343563003/ ) (agrieve@chromium.org)
  https://crrev.com/1575589a1d8f61fee45ec53ccbf77f073fd38847 recipe_modules/chromite: Use "build_type". (dnj@chromium.org)
  https://crrev.com/5799bab975aa3eda6785f36d9f7879549074b28b Reland of Enable the ninja up-to-date check for Android builders (agrieve@chromium.org)
  https://crrev.com/ecdf065c9d2a6e28d86c8ad333432b497158ee7a chromium.android: Enable swarming on Android arm64 builder (bpastene@chromium.org)
  https://crrev.com/7a71133c89aa2a770fc2326188306cf6a3a6f1e1 Revert of Enable the ninja up-to-date check for Android builders (patchset #1 id:1 of https://codereview.chromium.org/2343953002/ ) (agrieve@chromium.org)
  https://crrev.com/c65424c419105e0720cc0de09fb9e7a36c3d4601 Pass ninja -n in the ninja -d explain step to avoid more work (agrieve@chromium.org)
  https://crrev.com/8091fad9d075ecec116e1740360ff955a7654c4a Remove use_isolate from Marshmallow 64 bit Tester (bpastene@chromium.org)
  https://crrev.com/2f0a7c064259dc0e0bf375c2d1771544f5647a1c Changed sequence of package_build step to be before package_build_for_bisect (miimnk@google.com)
  https://crrev.com/194bd0247efb60371dbcae87731f13dce4fa7934 Roll recipe dependencies (trivial). (recipe-roller@chromium.org)
  https://crrev.com/d2845f7e87aa167cf7df78003b5768f948803d07 Roll recipe dependencies (trivial). (recipe-roller@chromium.org)
  https://crrev.com/eb686c79229ef3cf3b39e6a0807f4c98e3e93cf9 Add BuildBucket manifest scheduling support. (dnj@chromium.org)
  https://crrev.com/537cdb699a70d5d55f3eefb923eae1dc5104a8eb Add goma to wasm waterfall (sbc@chromium.org)
  https://crrev.com/b6d326d6f6f9608bba307109cc4a1c5efc5946bb Run the ninja "up-to-date" check for all compiles, but just as an fyi (agrieve@chromium.org)
  https://crrev.com/07a33586eff8451bbc84366055c3cfa36e7b6fea Roll recipe dependencies (nontrivial). (recipe-roller@chromium.org)
  https://crrev.com/79d8d758281609aa49b9b9af7e18cc187c2ee814 Disable CompilerInfoCache for a while (shinyak@chromium.org)
  https://crrev.com/a8f07009101d46553ea5d4bce1353ecb365dd3a5 Revert "Roll recipe dependencies (nontrivial)." (tandrii@chromium.org)
  https://crrev.com/cbca79967afa4f28df6b0ede337db6138eeb167b Add asan=1 to GYP_DEFINES for Dart asan builds (whesse@google.com)
  https://crrev.com/25b922d8edc1927c3af4bb4a8f7db6434096dca0 WebRTC: Disable iOS API Framework Builder. (ehmaldonado@chromium.org)
  https://crrev.com/769dbabae3b7ff11023dd1b393fcd2a12e165c65 Make sure goma_ctl is running during wasm_llvm build (sbc@chromium.org)
  https://crrev.com/2e89429885f7c2503565cb12d564d0f6f58a42f1 Fix Webkit capitalization for N CTS tests. (mikecase@chromium.org)
  https://crrev.com/e549894cc4f86f3f2107e3686d561ff83331a267 crashpad/continuous: Use bot_update. (dnj@chromium.org)
  https://crrev.com/f74386f7e19ff3f32693d222262d1a3ee79799ef Roll recipe dependencies (trivial). (recipe-roller@chromium.org)
  https://crrev.com/1a9a50a459c9e3c081719d3e835cac213c319136 Roll recipe dependencies (trivial). (recipe-roller@chromium.org)
depot_tools:
  https://crrev.com/f46c20fcee6e6a0a7d75788847632cd4ac18e2e9 codereview.settings: add GIT_NUMBER_FOOTER setting. (tandrii@chromium.org)
  https://crrev.com/5d0a0421ce27046c94177511a05699316ec8097a git_cl: update outdated TODOs. (tandrii@chromium.org)
  https://crrev.com/73449b0bd49eab1e152f419102123d734896da98 Gerrit git cl land: abort if not uploaded. (tandrii@chromium.org)
  https://crrev.com/bf42940536f6c0c123a9e6278c20bc38729b3717 git cl land to refs/pending: remove unused arg. (tandrii@chromium.org)
  https://crrev.com/7475196d4c32d66e1c199bf24945b7ae28255e13 repo: update to v1.12.17-cr1 (vapier@chromium.org)
  https://crrev.com/adcd4b78d5f35da535ccf82a221afb9fa389f631 presubmit_support: Remove a noisy logging.debug() (thakis@chromium.org)
  https://crrev.com/18ca30ca804679ee624a52e73017d234a8c0008f Teach bot_update to remove partially deleted git repos. (vadimsh@chromium.org)
  https://crrev.com/972ac5040176acd90c8a1ce412f75d19f77cc4e8 bot_update: ensure correct depot_tools checkout is used. (tandrii@chromium.org)
  https://crrev.com/15a248123d9032061486cd2d4b3f64369c93a9a5 Revert of bot_update: ensure correct depot_tools checkout is used. (patchset #2 id:20001 of https://codereview.chromium.org/2346973003/ ) (tandrii@chromium.org)
  https://crrev.com/7f245d07b2282f9847072fccddf7162a7e632a2d Bump git-on-windows bleeding edge version to 2.10.0. (vadimsh@chromium.org)
  https://crrev.com/6ac12ffd596e338c43e25dc3889e8ac552c2e885 Make bot_update.py print git version it uses. (vadimsh@chromium.org)
  https://crrev.com/7e16cf303221bbcf81d632924e19ddc888da9c3b owners.py: partial fix for owners-check perf regression (nick@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org
BUG=646165,none,646838,632008,webrtc:6372,chromium:647812,642493,647446,chromium:627996,642793,635641,645662,chromium:632203,647046,609225,642759

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2345413002

[modify] https://crrev.com/7d6811c4c58a9e280bca7bf65a8dfde001bef42a/infra/config/recipes.cfg

Labels: Milestone-Fishfood
Project Member

Comment 11 by bugdroid1@chromium.org, Nov 24 2016

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

commit 06a2502fc9e3259513b55a88a66bd2056ec65a22
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Thu Nov 24 15:47:00 2016

git cl land: add test expectations for Rietveld.

This is preperatory work for Cr- footers generation in git cl instead
of gnumbd.

BUG= 642493 

Change-Id: I4cfdd882fe6caa7972e51ffa81d335104ddb56dd
Reviewed-on: https://chromium-review.googlesource.com/414464
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>

[modify] https://crrev.com/06a2502fc9e3259513b55a88a66bd2056ec65a22/git_cl.py
[modify] https://crrev.com/06a2502fc9e3259513b55a88a66bd2056ec65a22/tests/git_cl_test.py

Project Member

Comment 12 by bugdroid1@chromium.org, Nov 24 2016

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

commit 813ec3c322347867424fd93df32fd77ac16f69b7
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Thu Nov 24 16:06:01 2016

git cl land + gnumbd: add asserts.

BUG= 642493 

Change-Id: Ib1234922e4bcd4ee286fffb8f7c637e4d2442a42
Reviewed-on: https://chromium-review.googlesource.com/414504
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>

[modify] https://crrev.com/813ec3c322347867424fd93df32fd77ac16f69b7/git_cl.py

Project Member

Comment 13 by bugdroid1@chromium.org, Nov 24 2016

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

commit 5fb4774810250f0612cab9ec7aa44bd676f73ffc
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Thu Nov 24 16:09:40 2016

git cl: rework setting to auto-generate git number footers.

BUG= 642493 

Change-Id: I1c83c54f7ad938cf4abeadb42f8d9414521d6dc5
Reviewed-on: https://chromium-review.googlesource.com/414465
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

[modify] https://crrev.com/5fb4774810250f0612cab9ec7aa44bd676f73ffc/git_cl.py
[modify] https://crrev.com/5fb4774810250f0612cab9ec7aa44bd676f73ffc/tests/git_cl_test.py

Project Member

Comment 14 by bugdroid1@chromium.org, Nov 24 2016

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

commit b8c535f696faf93835aa1fe7b99e00cbdc6d5a79
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Thu Nov 24 17:01:52 2016

Use codereview.settings style for GENERATE_GIT_NUMBER_FOOTERS.

R=sergiyb@chromium.org
BUG= 642493 

Change-Id: Ic4acf4076fdf27c1ed5e75f0ed1dda4b16d675fc
Reviewed-on: https://chromium-review.googlesource.com/414469
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

[modify] https://crrev.com/b8c535f696faf93835aa1fe7b99e00cbdc6d5a79/git_cl.py
[modify] https://crrev.com/b8c535f696faf93835aa1fe7b99e00cbdc6d5a79/tests/git_cl_test.py

Project Member

Comment 15 by bugdroid1@chromium.org, Dec 5 2016

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

commit 15e50cc5c40097b5959cd3f96ae7677908bf8d87
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Fri Dec 02 13:34:08 2016

git cl: implement git number footer generation.

BUG= 642493 

Change-Id: Ic8eb121b0ad7adcc7a3f3f1967ef2261f415e731
Reviewed-on: https://chromium-review.googlesource.com/414466
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

[modify] https://crrev.com/15e50cc5c40097b5959cd3f96ae7677908bf8d87/git_cl.py
[modify] https://crrev.com/15e50cc5c40097b5959cd3f96ae7677908bf8d87/tests/git_cl_test.py

Project Member

Comment 16 by bugdroid1@chromium.org, Dec 6 2016

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

commit a6695810bb193a83ec31d0471b9594af43d1a464
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Tue Dec 06 16:47:09 2016

git cl replacing gnumbd: set correct committer timestamp.

BUG= 642493 
R=sergiyb@chromium.org

Change-Id: I5d8588f2b6f30368188aecab2d2c462a11aa6883
Reviewed-on: https://chromium-review.googlesource.com/414369
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

[modify] https://crrev.com/a6695810bb193a83ec31d0471b9594af43d1a464/git_cl.py
[modify] https://crrev.com/a6695810bb193a83ec31d0471b9594af43d1a464/tests/git_cl_test.py

Cc: tandrii@chromium.org
 Issue 642494  has been merged into this issue.
Summary: Commit position footer generation in Rieveld's CQ and git cl land (was: Commit position footer generation in Rieveld git cl land)
Project Member

Comment 20 by bugdroid1@chromium.org, Dec 7 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/b986842b8734aeb74aaadd8f20153195835ed39b

commit b986842b8734aeb74aaadd8f20153195835ed39b
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Tue Dec 06 19:44:44 2016

Project Member

Comment 21 by bugdroid1@chromium.org, Dec 7 2016

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

commit cd6a9363ef9137a1c9296a63e552e102a414cec9
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Wed Dec 07 11:04:12 2016

git_cl: add GitNumbererState in preparation to stop gnumbd service.

The new class is unused and doesn't change any existing functionality.

BUG= chromium:642493 
R=machenbach@chromium.org,iannucci@chromium.org

Change-Id: Id3fe71b07b694339f0a620b427816e52560069d8
Reviewed-on: https://chromium-review.googlesource.com/416430
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

[modify] https://crrev.com/cd6a9363ef9137a1c9296a63e552e102a414cec9/git_cl.py
[modify] https://crrev.com/cd6a9363ef9137a1c9296a63e552e102a414cec9/tests/git_cl_test.py

Blockedon: 672043
Project Member

Comment 23 by bugdroid1@chromium.org, Dec 8 2016

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

commit 768f1d88a0c5cf478f84e3706e92b7caf9c5e8c7
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Thu Dec 08 14:10:13 2016

git cl: use gnumbd config instead of PENDING_REF_PREFIX of codereview.settings.

BUG= chromium:642493 , 672043 
R=machenbach@chromium.org,iannucci@chromium.org

Change-Id: I0abc31b95b1766fd5fd24c1379b538d0c5291011
Reviewed-on: https://chromium-review.googlesource.com/417259
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>

[modify] https://crrev.com/768f1d88a0c5cf478f84e3706e92b7caf9c5e8c7/git_cl.py
[modify] https://crrev.com/768f1d88a0c5cf478f84e3706e92b7caf9c5e8c7/tests/git_cl_test.py

Project Member

Comment 24 by bugdroid1@chromium.org, Dec 9 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/12cc4888094bd7dce9df3a4ab0b459e5809c1bf7

commit 12cc4888094bd7dce9df3a4ab0b459e5809c1bf7
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Fri Dec 09 09:26:13 2016

Project Member

Comment 25 by bugdroid1@chromium.org, Dec 9 2016

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

commit cbec8efcee50c04e659d909f132bb3bbf12a2e04
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Fri Dec 09 12:54:51 2016

git cl + git-numberer: add extra regression test case.

R=machenbach@chromium.org
BUG= chromium:642493 , 672043 

Change-Id: Ie50637d6e01e40ddd15dcdfc1430c9554fa82976
Reviewed-on: https://chromium-review.googlesource.com/418715
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

[modify] https://crrev.com/cbec8efcee50c04e659d909f132bb3bbf12a2e04/tests/git_cl_test.py

Update:

I deployed latest CQ change to production. I went through end2end test, which showed that:
1. My changes didn't break existing workflows. GOOD!
2. git cl land still works with and without gnumbd.
3. CQ without gnumbd but with "pending" in target_ref name fails (see below).

Thus, the end2end test is frozen and to be continued after I fix CQ.

The root cause problem is that in CQ code there is a horrible mess of various target refs that take precedence over each other somehow :(
  * cq.cfg's optional target_ref (added for gnumbd repos)
  * whatever ref cq.cfg was located on (that was original design of CQ.cfg in luci-config)
  * Rietveld (hardcoded 'pending' auto-added to v8, chromium, but NOT webrtc (see https://chromium-review.googlesource.com/c/417842/)


So, to work around this mess (rather than trying to understand it), I did this:
1. remove 'pending' from `target_ref` if any
2. check if git-numbering should be added in CQ given that CL is for `target_ref` (without pending)
3. If so, add the proper footers and CL is definitely for `target_ref` (without pending)

The immediate problem is that before 1. there is 0. which is "git fetch origin `target_ref`", which contains 'pending'. This FETCH_HEAD becomes a parent for commit in 3, and hence numbering fails :(

So, I have to re-order things:

1. check if git-numbering should be added in CQ
2. If 1., fetch `target_ref` without 'pending', else fetch `target_ref` as is
3. If 1., add git number footers on top of `target_ref` without pending.


Actual log:


[D2016-12-09T07:02:22.300711-08:00 8115 140203637339904 utils.subprocess2:207] git checkout --force --quiet refs/remotes/origin/refs/pending/heads/gnumb-test/cq;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:22.423257-08:00 8115 140203637339904 utils.subprocess2:207] git branch;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:22.441929-08:00 8115 140203637339904 utils.subprocess2:207] git branch -D working_branch;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:22.458760-08:00 8115 140203637339904 utils.subprocess2:207] git rev-parse HEAD;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:22.474174-08:00 8115 140203637339904 utils.rietveld:450] POSTing to https://codereview.chromium.org/api/2564033002/1?try_jobs=false, args {'payload': None, 'timeout': 15}.
[D2016-12-09T07:02:22.564789-08:00 8115 140203637339904 utils.rietveld:162] tools/whitespace.txt
[D2016-12-09T07:02:22.565879-08:00 8115 140203637339904 utils.rietveld:450] POSTing to https://codereview.chromium.org/download/issue2564033002_1_10001.diff, args {'payload': None, 'timeout': 15}.
[D2016-12-09T07:02:22.725703-08:00 8115 140203637339904 utils.subprocess2:207] git checkout -b working_branch -t refs/remotes/origin/refs/pending/heads/gnumb-test/cq --quiet;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:22.848307-08:00 8115 140203637339904 utils.subprocess2:207] git apply --index -p1;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:22.920569-08:00 8115 140203637339904 utils.subprocess2:207] git commit -m Committed patch;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:22.993071-08:00 8115 140203637339904 utils.subprocess2:207] git diff refs/remotes/origin/refs/pending/heads/gnumb-test/cq --name-only;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:23.066110-08:00 8115 140203637339904 utils.subprocess2:207] git rev-parse --abbrev-ref HEAD;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:23.082638-08:00 8115 140203637339904 utils.subprocess2:207] git fetch https://chromium.googlesource.com/v8/v8 +refs/meta/config:refs/git_cl/meta/config +refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main;  cwd=/b/i$
fra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:23.857085-08:00 8115 140203637339904 utils.subprocess2:207] git show refs/git_cl/gnumbd-config/main:config.json;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:23.881989-08:00 8115 140203637339904 utils.subprocess2:207] git show refs/git_cl/meta/config:project.config;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:24.072815-08:00 8115 140203637339904 utils.subprocess2:207] git config -f /tmp/git_cl_proj_configszSHH9 --get-all plugin.git-numberer.validate-enabled-refglob;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:24.086622-08:00 8115 140203637339904 utils.subprocess2:207] git config -f /tmp/git_cl_proj_configszSHH9 --get-all plugin.git-numberer.validate-disabled-refglob;  cwd=/b/infra_internal/commit_queue/workdir/v8
[I2016-12-09T07:02:24.095321-08:00 8115 140203637339904 utils.git_cl:294] validator config enabled ['refs/heads/master', 'refs/heads/gnumb-test/*', 'refs/heads/playground', 'refs/heads/*.*.*', 'refs/branch-heads/*.*', 'refs/internal/*'] $
isabled [] refglobs for (this ref: refs/heads/gnumb-test/cq)
[D2016-12-09T07:02:24.096607-08:00 8115 140203637339904 utils.git_cl:327] _GitNumbererState(pending: None, validator: True)
[D2016-12-09T07:02:24.097357-08:00 8115 140203637339904 utils.subprocess2:207] git rev-parse HEAD~1;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:24.112078-08:00 8115 140203637339904 utils.subprocess2:207] git show -s --format=%B HEAD~1;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-09T07:02:24.130596-08:00 8115 140203637339904 checkouts:491] adding git number with parent u'77f4bbc8680b4f52d78295bfe5177d725c4d476d' msg('git cl commit.\n\nBUG=\n\nReview-Url: https://codereview.chromium.org/2564433005 .\n\n'$
 destined for refs/heads/gnumb-test/cq
[E2016-12-09T07:02:24.144945-08:00 8115 140203637339904 errors:171] Transient error: Unable to get commit position from footers
  File "/usr/lib/python2.7/threading.py", line 783, in __bootstrap
    self.__bootstrap_inner()
  File "/usr/lib/python2.7/threading.py", line 810, in __bootstrap_inner
    self.run()
  File "/usr/lib/python2.7/threading.py", line 763, in run
    self.__target(*self.__args, **self.__kwargs)
  File "/b/infra_internal/commit_queue/pending_manager/base.py", line 334, in _commit
    self._commit_patch(pending)
  File "/b/infra_internal/commit_queue/pending_manager/rietveld.py", line 450, in _commit_patch
    self._commit_to_checkout(pending)
  File "/b/infra_internal/commit_queue/pending_manager/rietveld.py", line 405, in _commit_to_checkout
    pre_push_cb=lambda cr, pr: pending._publish_intent_to_push(
  File "/b/infra_internal/commit_queue/checkouts.py", line 587, in amend_and_push
    original_description, target_remote_ref)
  File "/b/infra_internal/commit_queue/checkouts.py", line 529, in _add_git_number
    description, parent_rev, parent_msg, target_remote_ref)
  File "/b/infra_internal/commit_queue/errors.py", line 205, in wrapper
    return func(obj, *args, **kwargs), None
  File "/usr/lib/python2.7/contextlib.py", line 35, in __exit__
    self.gen.throw(type, value, traceback)
  File "/b/infra_internal/commit_queue/errors.py", line 169, in track_exceptions
    self.stacktrace = (''.join(traceback.format_stack()) +
Traceback (most recent call last):
  File "/b/infra_internal/commit_queue/errors.py", line 166, in track_exceptions
    yield ctx
  File "/b/infra_internal/commit_queue/errors.py", line 205, in wrapper
    return func(obj, *args, **kwargs), None
  File "/b/infra_internal/commit_queue/checkouts.py", line 494, in _add_git_number_footers
    parent_rev, parent_msg, target_remote_ref)
  File "/b/infra_internal/commit_queue/utils/git_cl.py", line 169, in update_with_git_number_footers
    parent_position = git_footers.get_position(parent_footer_map)
  File "/b/infra_internal/commit_queue/utils/git_footers.py", line 143, in get_position
    raise ValueError('Unable to get commit position from footers')
ValueError: Unable to get commit position from footers

[W2016-12-09T07:02:24.151597-08:00 8115 140203637339904 cq_alerts:71] Sending alert (Unexpected CQ committing exception): Unexpected exception when committing 2564033002
Exception:
Traceback (most recent call last):
  File "/b/infra_internal/commit_queue/pending_manager/rietveld.py", line 450, in _commit_patch
    self._commit_to_checkout(pending)
  File "/b/infra_internal/commit_queue/pending_manager/rietveld.py", line 408, in _commit_to_checkout
    raise error.error_object
ValueError: Unable to get commit position from footers

Stack trace:
  File "/usr/lib/python2.7/threading.py", line 783, in __bootstrap
    self.__bootstrap_inner()
  File "/usr/lib/python2.7/threading.py", line 810, in __bootstrap_inner
    self.run()
  File "/usr/lib/python2.7/threading.py", line 763, in run
    self.__target(*self.__args, **self.__kwargs)
  File "/b/infra_internal/commit_queue/pending_manager/base.py", line 334, in _commit
    self._commit_patch(pending)
  File "/b/infra_internal/commit_queue/pending_manager/rietveld.py", line 492, in _commit_patch
    fmt_exc=True, fmt_stack=True)

[D2016-12-09T07:02:24.206971-08:00 8115 140203637339904 pending_manager.rietveld:500] _discard_pending(RietveldPendingCommit(id=2564033002, patchset=1), CQ experienced an internal error when committing your CL and the maintainers were not
ified. Sorry for the inconvenience.)



Project Member

Comment 27 by bugdroid1@chromium.org, Dec 12 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/5e8aeee07a5b7d1cc57eb6a9a8582dca113363d6

commit 5e8aeee07a5b7d1cc57eb6a9a8582dca113363d6
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Mon Dec 12 14:30:50 2016

Project Member

Comment 28 by bugdroid1@chromium.org, Dec 14 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/6e4b3035ffd38828d80d67069e5a66ca8d28e44a

commit 6e4b3035ffd38828d80d67069e5a66ca8d28e44a
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Wed Dec 14 14:54:53 2016

Project Member

Comment 29 by bugdroid1@chromium.org, Dec 14 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/0bd48fa32f726158286251b2a83a606913e9cc26

commit 0bd48fa32f726158286251b2a83a606913e9cc26
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Wed Dec 14 15:19:39 2016

Project Member

Comment 30 by bugdroid1@chromium.org, Dec 14 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/0bd48fa32f726158286251b2a83a606913e9cc26

commit 0bd48fa32f726158286251b2a83a606913e9cc26
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Wed Dec 14 15:19:39 2016

OK, i got all the way to amend:

[D2016-12-14T07:27:33.688787-08:00 27188 139706993399552 utils.subprocess2:207] git config -f /tmp/git_cl_proj_config1eUgxc --get-all plugin.git-numberer.validate-enabled-refglob;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:33.701835-08:00 27188 139706993399552 utils.subprocess2:207] git config -f /tmp/git_cl_proj_config1eUgxc --get-all plugin.git-numberer.validate-disabled-refglob;  cwd=/b/infra_internal/commit_queue/workdir/v8
[I2016-12-14T07:27:33.708647-08:00 27188 139706993399552 utils.git_cl:294] validator config enabled ['refs/heads/master', 'refs/heads/gnumb-test/*', 'refs/heads/playground', 'refs/heads/*.*.*', 'refs/branch-heads/*.*', 'refs/internal/*'] 
disabled [] refglobs for (this ref: refs/heads/gnumb-test/cq)
[D2016-12-14T07:27:33.710307-08:00 27188 139706993399552 utils.git_cl:327] _GitNumbererState(pending: None, validator: True)
[D2016-12-14T07:27:33.711093-08:00 27188 139706993399552 utils.subprocess2:207] git git rebase --abort;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:33.723552-08:00 27188 139706993399552 utils.subprocess2:207] git reset --hard;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:33.843627-08:00 27188 139706993399552 utils.subprocess2:207] git clean -x -d -f;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:33.882173-08:00 27188 139706993399552 utils.subprocess2:207] git fetch --quiet origin +refs/heads/gnumb-test/cq:refs/remotes/origin/refs/heads/gnumb-test/cq;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:34.604505-08:00 27188 139706993399552 utils.subprocess2:207] git checkout --force --quiet refs/remotes/origin/refs/heads/gnumb-test/cq;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:34.725497-08:00 27188 139706993399552 utils.subprocess2:207] git branch;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:34.747605-08:00 27188 139706993399552 utils.subprocess2:207] git branch -D working_branch;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:34.761827-08:00 27188 139706993399552 utils.subprocess2:207] git rev-parse HEAD;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:34.775271-08:00 27188 139706993399552 utils.rietveld:450] POSTing to https://codereview.chromium.org/api/2564033002/1?try_jobs=false, args {'payload': None, 'timeout': 15}.
[D2016-12-14T07:27:34.904071-08:00 27188 139706993399552 utils.rietveld:162] tools/whitespace.txt
[D2016-12-14T07:27:34.904796-08:00 27188 139706993399552 utils.rietveld:450] POSTing to https://codereview.chromium.org/download/issue2564033002_1_10001.diff, args {'payload': None, 'timeout': 15}.
[D2016-12-14T07:27:34.990427-08:00 27188 139706993399552 utils.subprocess2:207] git checkout -b working_branch -t refs/remotes/origin/refs/heads/gnumb-test/cq --quiet;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:35.111392-08:00 27188 139706993399552 utils.subprocess2:207] git apply --index -p1;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:35.150516-08:00 27188 139706993399552 utils.subprocess2:207] git commit -m Committed patch;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:35.220934-08:00 27188 139706993399552 utils.subprocess2:207] git diff refs/remotes/origin/refs/heads/gnumb-test/cq --name-only;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:35.259040-08:00 27188 139706993399552 utils.subprocess2:207] git rev-parse --abbrev-ref HEAD;  cwd=/b/infra_internal/commit_queue/workdir/v8
[I2016-12-14T07:27:35.272674-08:00 27188 139706993399552 checkouts:516] generating git numberer footers in commit for refs/heads/gnumb-test/cq
[D2016-12-14T07:27:35.273845-08:00 27188 139706993399552 utils.subprocess2:207] git rev-parse HEAD~1;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:35.287281-08:00 27188 139706993399552 utils.subprocess2:207] git show -s --format=%B HEAD~1;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:35.306466-08:00 27188 139706993399552 checkouts:495] adding git number with parent u'7a7781c6413c30bbe96766719bc5b011bf49107d' msg('git cl commit.\n\nBUG=\n\nReview-Url: https://codereview.chromium.org/2564433005 .\nCr$
Commit-Position: refs/heads/gnumb-test/cq@{#2}\nCr-Branched-From: 5c49df2da689e4374ea073a89714b4597283d138-refs/heads/master@{#41618}') destined for refs/heads/gnumb-test/cq
[D2016-12-14T07:27:35.308347-08:00 27188 139706993399552 utils.subprocess2:207] git show -s --format=%ct HEAD~1;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:35.321576-08:00 27188 139706993399552 utils.subprocess2:207] git show -s --format=%ct HEAD;  cwd=/b/infra_internal/commit_queue/workdir/v8
[D2016-12-14T07:27:35.335360-08:00 27188 139706993399552 utils.subprocess2:207] git commit --amend --author tandrii <tandrii@chromium.org> -F /tmp/tmpLFpYTW;  cwd=/b/infra_internal/commit_queue/workdir/v8
[W2016-12-14T07:27:35.373363-08:00 27188 139706993399552 checkouts:683] command 'git commit --amend --author tandrii <tandrii@chromium.org> -F /tmp/tmpLFpYTW' with kwargs {'cwd': u'/b/infra_internal/commit_queue/workdir/v8', 'env': {'GIT$
COMMITTER_DATE': '1481729255+0000'}, 'stderr': '<PIPE>', 'stdout': '<PIPE>', 'timeout': 900} failed with stdout '' stderr '\n*** Please tell me who you are.\n\nRun\n\n  git config --global user.email "you@example.com"\n  git config --glo$
al user.name "Your Name"\n\nto set your account\'s default identity.\nOmit --global to set the identity only in this repository.\n\nfatal: empty ident name (for <(null)>) not allowed\n'
[E2016-12-14T07:27:35.376626-08:00 27188 139706993399552 errors:171] Transient error: Command git commit --amend --author tandrii <tandrii@chromium.org> -F /tmp/tmpLFpYTW returned non-zero exit status 128 in /b/infra_internal/commit_queu$
/workdir/v8

*** Please tell me who you are.

Run

  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident name (for <(null)>) not allowed

Project Member

Comment 32 by bugdroid1@chromium.org, Dec 14 2016

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

commit 8f15f3ec1dbfbb6b6c0bc98eedc7a323d02fe317
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Wed Dec 14 14:43:49 2016

git cl refactor: s/should_git_number/should_add_git_number

R=sergiyb@google.com
BUG= chromium:642493 

Change-Id: Id7b732d82c25ce88a3295ff54c79cf2a66e0d5b9
Reviewed-on: https://chromium-review.googlesource.com/419437
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

[modify] https://crrev.com/8f15f3ec1dbfbb6b6c0bc98eedc7a323d02fe317/git_cl.py
[modify] https://crrev.com/8f15f3ec1dbfbb6b6c0bc98eedc7a323d02fe317/tests/git_cl_test.py

Project Member

Comment 33 by bugdroid1@chromium.org, Dec 14 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/1268a57f8f47cca8f6c32cbe3168ce9140f5487d

commit 1268a57f8f47cca8f6c32cbe3168ce9140f5487d
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Wed Dec 14 15:46:36 2016

More progress here. Stuck on git cl landing on fresh new branch with lots of lineage.

Generated (first) commit and branch-tip of refs/heads/gnumb-test/cl aka parent (second)


commit ee674bef8ad581a62275c28007b53ca82bb5813d                                                                                                                                                                                      
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date:   Wed Dec 14 18:35:01 2016 +0100

    git cl on fresh new branch + numbering.
    
    TBR=machenbach@chromium.org
    
    Review-Url: https://codereview.chromium.org/2575043003 .
    Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}
    Cr-Branched-From: 7e3fa49d98a4b289d473cebe8a471d83e4e4d155-refs/heads/gnumb-test/br@{#1}
    Cr-Branched-From: 5c49df2da689e4374ea073a89714b4597283d138-refs/heads/master@{#41618}
    Cr-Branched-From: 0749ff9edcd8214f912d65bfc285110966795ea8-refs/heads/gnumb-test/cq@{#4}

commit 7e3fa49d98a4b289d473cebe8a471d83e4e4d155
Author: tandrii <tandrii@chromium.org>
Date:   Wed Dec 14 09:29:43 2016 -0800

    CQ commit on fresh new branch + numbering.
    
    TBR=machnenbach@chromium.org
    NOTRY=True
    NOPRESUBMIT=True
    BUG=
    
    Review-Url: https://codereview.chromium.org/2577703003
    Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}
    Cr-Branched-From: 0749ff9edcd8214f912d65bfc285110966795ea8-refs/heads/gnumb-test/cq@{#4}
    Cr-Branched-From: 5c49df2da689e4374ea073a89714b4597283d138-refs/heads/master@{#41618}
Project Member

Comment 36 by bugdroid1@chromium.org, Dec 14 2016

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

commit b5effa1f24a7f909997800559edbc53e5ba08fbf
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Wed Dec 14 18:35:12 2016

git cl + git numberer: fix 3+ lineage ordering.

In other words, end 2 end test was a really awesome idea.

R=machenbach@chromium.org,sergiyb@chromium.org
BUG= 642493 
TEST=git cl land of https://codereview.chromium.org/2575043003 succeeded

Change-Id: I568ce79baf109b2aa556e4343527b63f39c10d00
Reviewed-on: https://chromium-review.googlesource.com/419478
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/b5effa1f24a7f909997800559edbc53e5ba08fbf/git_cl.py
[modify] https://crrev.com/b5effa1f24a7f909997800559edbc53e5ba08fbf/tests/git_cl_test.py

Status: Verified (was: Started)
End to end test passed!
Status: Started (was: Verified)
Nope, not fixed yet. Forgot about this CL https://chrome-internal-review.googlesource.com/c/311738/
Project Member

Comment 39 by bugdroid1@chromium.org, Dec 15 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/021795ca6a21b5af6011290fa43ac4a0d1ee636d

commit 021795ca6a21b5af6011290fa43ac4a0d1ee636d
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Thu Dec 15 08:34:20 2016

Project Member

Comment 40 by bugdroid1@chromium.org, Dec 16 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/9bbb8342df212b836a34c683b6e15caa26e3e332

commit 9bbb8342df212b836a34c683b6e15caa26e3e332
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Fri Dec 16 15:00:00 2016

Status: Fixed (was: Started)

Sign in to add a comment