New issue
Advanced search Search tips

Issue 884225 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Sep 28
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 1
Type: Bug

Blocking:
issue 891633



Sign in to add a comment

CIDB should include branch name.

Project Member Reported by dgarr...@chromium.org, Sep 14

Issue description

The CIDB database does not include branch names in the buildTable schema. In the past, we distinguished branch builds from TOT builds by looking at the "builder_name" field (buildbot column name), but for swarming builds, "builder_name" and "build_config" are always the same value.

This means it's impossible to distinguish between "master-release" on TOT versus a release or stabilize branch.

We should add a branch field to CIDB, populate it, and possibly merge to release branches that are running on swarming (R69 and R70).

 
After this is done, Stainless should be updated to import and use the branch name (http://b/113763944).
Cc: derat@chromium.org nya@chromium.org jamescook@chromium.org
Note, this is a problem for looking at lab results for release branches today.
Cc: mikenichols@chromium.org jclinton@chromium.org
Owner: dgarr...@chromium.org
Status: Started (was: Untriaged)
Project Member

Comment 5 by bugdroid1@chromium.org, Sep 20

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/97404d505743593dc2299242d0b1dffb86582a5a

commit 97404d505743593dc2299242d0b1dffb86582a5a
Author: Don Garrett <dgarrett@google.com>
Date: Thu Sep 20 18:39:40 2018

CIDB: Add branch column to buildtable.

This creates a new optional branch column to the build table. We will
start populating it for new builds shortly. Existing builds will never
be updated.

BUG= chromium:884225 
TEST=cidb_integration_test

Change-Id: Ib82e4f3b893adc141ded48acaf34d31769bc979a
Reviewed-on: https://chromium-review.googlesource.com/1231358
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>

[modify] https://crrev.com/97404d505743593dc2299242d0b1dffb86582a5a/cidb/schema.dump
[add] https://crrev.com/97404d505743593dc2299242d0b1dffb86582a5a/cidb/migrations/00065_add_branch_to_build_table.sql

Deployed to Debug CIDB.
Deployed to Prod CIDB.
Project Member

Comment 8 by bugdroid1@chromium.org, Sep 21

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/0464dbfe8e216882669df371cebd5c81879444f2

commit 0464dbfe8e216882669df371cebd5c81879444f2
Author: Don Garrett <dgarrett@google.com>
Date: Fri Sep 21 16:01:28 2018

cidb: UpdateMetadata to include branch.

Update the CIDB build table to include branch information pulled from
existing cbuildbot metadata. This cannot land until the earlier schema
change is both landed and deployed, or all cbuildbot builds will fail
while updating metadata.

BUG= chromium:884225 
TEST=run_tests

Change-Id: I6d9f14912b2ad56671ce8fd46ea8780985f23ae7
Reviewed-on: https://chromium-review.googlesource.com/1231379
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>

[modify] https://crrev.com/0464dbfe8e216882669df371cebd5c81879444f2/lib/cidb.py

Labels: Merge-Request-70 Merge-Request-69 Merge-Request-68
Project Member

Comment 10 by sheriffbot@chromium.org, Sep 21

Labels: -Merge-Request-70 Merge-Review-70 Hotlist-Merge-Review
This bug requires manual review: M70 has already been promoted to the beta branch, so this requires manual review
Please contact the milestone owner if you have questions.
Owners: benmason@(Android), kariahda@(iOS), geohsu@(ChromeOS), abdulsyed@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Labels: -Merge-Request-68 -Merge-Request-69 -Merge-Review-70 Merge-Approved-69 Merge-Approved-70 Merge-Approved-68
Approved back to 68, as this should have no impact on the functionality of the OS image itself.
Project Member

Comment 12 by bugdroid1@chromium.org, Sep 21

Labels: merge-merged-release-R65-10323.B
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/caec34540a5d03f9266925235be33ff2092c4d35

commit caec34540a5d03f9266925235be33ff2092c4d35
Author: Don Garrett <dgarrett@google.com>
Date: Fri Sep 21 18:44:17 2018

cidb: UpdateMetadata to include branch.

Update the CIDB build table to include branch information pulled from
existing cbuildbot metadata. This cannot land until the earlier schema
change is both landed and deployed, or all cbuildbot builds will fail
while updating metadata.

BUG= chromium:884225 
TEST=run_tests

Change-Id: I6d9f14912b2ad56671ce8fd46ea8780985f23ae7
Reviewed-on: https://chromium-review.googlesource.com/1231379
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
(cherry picked from commit 0464dbfe8e216882669df371cebd5c81879444f2)
Reviewed-on: https://chromium-review.googlesource.com/1238938

[modify] https://crrev.com/caec34540a5d03f9266925235be33ff2092c4d35/lib/cidb.py

Project Member

Comment 13 by bugdroid1@chromium.org, Sep 21

Labels: merge-merged-release-R70-11021.B
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/08036db777537eab95e35ac2fd92bf6f82332e5b

commit 08036db777537eab95e35ac2fd92bf6f82332e5b
Author: Don Garrett <dgarrett@google.com>
Date: Fri Sep 21 18:44:18 2018

cidb: UpdateMetadata to include branch.

Update the CIDB build table to include branch information pulled from
existing cbuildbot metadata. This cannot land until the earlier schema
change is both landed and deployed, or all cbuildbot builds will fail
while updating metadata.

BUG= chromium:884225 
TEST=run_tests

Change-Id: I6d9f14912b2ad56671ce8fd46ea8780985f23ae7
Reviewed-on: https://chromium-review.googlesource.com/1231379
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
(cherry picked from commit 0464dbfe8e216882669df371cebd5c81879444f2)
Reviewed-on: https://chromium-review.googlesource.com/1238935

[modify] https://crrev.com/08036db777537eab95e35ac2fd92bf6f82332e5b/lib/cidb.py

Project Member

Comment 14 by bugdroid1@chromium.org, Sep 21

Labels: merge-merged-release-R69-10895.B
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/0c318a1a05217640ce701db5b0df25a4709d866f

commit 0c318a1a05217640ce701db5b0df25a4709d866f
Author: Don Garrett <dgarrett@google.com>
Date: Fri Sep 21 18:44:19 2018

cidb: UpdateMetadata to include branch.

Update the CIDB build table to include branch information pulled from
existing cbuildbot metadata. This cannot land until the earlier schema
change is both landed and deployed, or all cbuildbot builds will fail
while updating metadata.

BUG= chromium:884225 
TEST=run_tests

Change-Id: I6d9f14912b2ad56671ce8fd46ea8780985f23ae7
Reviewed-on: https://chromium-review.googlesource.com/1231379
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
(cherry picked from commit 0464dbfe8e216882669df371cebd5c81879444f2)
Reviewed-on: https://chromium-review.googlesource.com/1238936

[modify] https://crrev.com/0c318a1a05217640ce701db5b0df25a4709d866f/lib/cidb.py

Project Member

Comment 15 by bugdroid1@chromium.org, Sep 21

Labels: merge-merged-release-R68-10718.B
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/e29f61416415569efd3ae05e8cc0826ce230393c

commit e29f61416415569efd3ae05e8cc0826ce230393c
Author: Don Garrett <dgarrett@google.com>
Date: Fri Sep 21 18:44:20 2018

cidb: UpdateMetadata to include branch.

Update the CIDB build table to include branch information pulled from
existing cbuildbot metadata. This cannot land until the earlier schema
change is both landed and deployed, or all cbuildbot builds will fail
while updating metadata.

BUG= chromium:884225 
TEST=run_tests

Change-Id: I6d9f14912b2ad56671ce8fd46ea8780985f23ae7
Reviewed-on: https://chromium-review.googlesource.com/1231379
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
(cherry picked from commit 041a654ce498eff2687f52a36fcfe6c62bea75a1)
Reviewed-on: https://chromium-review.googlesource.com/1238934

[modify] https://crrev.com/e29f61416415569efd3ae05e8cc0826ce230393c/lib/cidb.py

All future builds on these branches should have the "branch" field populated properly.

This should be enough to address the Stainless concerns.

For the Legoland issues, we will probably need a search index created that includes branch. Waiting until deburger confirms the exact index needed.
Project Member

Comment 17 by sheriffbot@chromium.org, Sep 24

Cc: bhthompson@google.com
This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Thanks a lot Don!

Note, buildTable already contained milestone_version column, which should be able to distinguish between different branches.
Milestone isn't correct 100% of the time (especially around branch creation), and doesn't help with firmware/factory branches.

branch / build_config should work 100% of the time.
Project Member

Comment 21 by bugdroid1@chromium.org, Sep 28

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/ac56ba4815aa57a8773063920e695b99786b0f8e

commit ac56ba4815aa57a8773063920e695b99786b0f8e
Author: Don Garrett <dgarrett@google.com>
Date: Fri Sep 28 02:44:49 2018

CIDB: Add index for build_config, branch, id.

Add CIDB migration 66, which adds an additional buildTable index for
build_config, branch, and id.

This makes it efficient for Legoland to do searches by branch.

BUG= chromium:884225 
TEST=cidb_integration_test

Change-Id: Ib68e9c50c0327ac74168348411c252be52e6978b
Reviewed-on: https://chromium-review.googlesource.com/1241532
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>

[modify] https://crrev.com/ac56ba4815aa57a8773063920e695b99786b0f8e/cidb/schema.dump
[add] https://crrev.com/ac56ba4815aa57a8773063920e695b99786b0f8e/cidb/migrations/00066_build_table_index_config_branch_id.sql
[modify] https://crrev.com/ac56ba4815aa57a8773063920e695b99786b0f8e/lib/cidb_integration_test.py

Project Member

Comment 22 by sheriffbot@chromium.org, Sep 28

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Status: Fixed (was: Started)
The new index is deployed.

Project Member

Comment 24 by bugdroid1@chromium.org, Oct 2

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/8962d4f57f00203b601e2aa9209ca0676ebd0d00

commit 8962d4f57f00203b601e2aa9209ca0676ebd0d00
Author: Shuhei Takahashi <nya@chromium.org>
Date: Tue Oct 02 12:20:04 2018

cidb: Include branch info on inserting builds.

CL:1231379 updated UpdateMetadata to fill branch info, but the
timing is a bit late to be saved by CI results archiver.

This change instead fill branch info on initial insertion of builds.
After this CL, CL:1231379 can be safely reverted.

BUG= chromium:884225 
TEST=run_tests

Change-Id: If4eabc8c803fe2d544769a58e1e5e8a82844906b
Reviewed-on: https://chromium-review.googlesource.com/1253962
Commit-Ready: Jason Clinton <jclinton@chromium.org>
Tested-by: Shuhei Takahashi <nya@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>

[modify] https://crrev.com/8962d4f57f00203b601e2aa9209ca0676ebd0d00/lib/fake_cidb.py
[modify] https://crrev.com/8962d4f57f00203b601e2aa9209ca0676ebd0d00/lib/cidb.py
[modify] https://crrev.com/8962d4f57f00203b601e2aa9209ca0676ebd0d00/cbuildbot/stages/report_stages.py

Project Member

Comment 25 by bugdroid1@chromium.org, Oct 3

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/02957291b036c11664f1fea1d23a855ffd3c3d23

commit 02957291b036c11664f1fea1d23a855ffd3c3d23
Author: Shuhei Takahashi <nya@chromium.org>
Date: Wed Oct 03 08:53:47 2018

cidb: Include branch info on inserting builds.

CL:1231379 updated UpdateMetadata to fill branch info, but the
timing is a bit late to be saved by CI results archiver.

This change instead fill branch info on initial insertion of builds.
After this CL, CL:1231379 can be safely reverted.

BUG= chromium:884225 
TEST=run_tests

Change-Id: If4eabc8c803fe2d544769a58e1e5e8a82844906b
Reviewed-on: https://chromium-review.googlesource.com/1253962
Commit-Ready: Jason Clinton <jclinton@chromium.org>
Tested-by: Shuhei Takahashi <nya@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
(cherry picked from commit 8962d4f57f00203b601e2aa9209ca0676ebd0d00)
Reviewed-on: https://chromium-review.googlesource.com/c/1258627
Reviewed-by: Shuhei Takahashi <nya@chromium.org>
Commit-Queue: Shuhei Takahashi <nya@chromium.org>
Trybot-Ready: Shuhei Takahashi <nya@chromium.org>

[modify] https://crrev.com/02957291b036c11664f1fea1d23a855ffd3c3d23/lib/fake_cidb.py
[modify] https://crrev.com/02957291b036c11664f1fea1d23a855ffd3c3d23/lib/cidb.py
[modify] https://crrev.com/02957291b036c11664f1fea1d23a855ffd3c3d23/cbuildbot/stages/report_stages.py

Project Member

Comment 26 by bugdroid1@chromium.org, Oct 3

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/b8a0f7663b5b20645255c7ab78c8c7550052cca2

commit b8a0f7663b5b20645255c7ab78c8c7550052cca2
Author: Shuhei Takahashi <nya@chromium.org>
Date: Wed Oct 03 08:53:49 2018

cidb: Include branch info on inserting builds.

CL:1231379 updated UpdateMetadata to fill branch info, but the
timing is a bit late to be saved by CI results archiver.

This change instead fill branch info on initial insertion of builds.
After this CL, CL:1231379 can be safely reverted.

BUG= chromium:884225 
TEST=run_tests

Change-Id: If4eabc8c803fe2d544769a58e1e5e8a82844906b
Reviewed-on: https://chromium-review.googlesource.com/1253962
Commit-Ready: Jason Clinton <jclinton@chromium.org>
Tested-by: Shuhei Takahashi <nya@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
(cherry picked from commit 8962d4f57f00203b601e2aa9209ca0676ebd0d00)
Reviewed-on: https://chromium-review.googlesource.com/c/1258628
Reviewed-by: Shuhei Takahashi <nya@chromium.org>
Commit-Queue: Shuhei Takahashi <nya@chromium.org>
Trybot-Ready: Shuhei Takahashi <nya@chromium.org>

[modify] https://crrev.com/b8a0f7663b5b20645255c7ab78c8c7550052cca2/lib/fake_cidb.py
[modify] https://crrev.com/b8a0f7663b5b20645255c7ab78c8c7550052cca2/lib/cidb.py
[modify] https://crrev.com/b8a0f7663b5b20645255c7ab78c8c7550052cca2/cbuildbot/stages/report_stages.py

Project Member

Comment 27 by bugdroid1@chromium.org, Oct 3

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/0ece81599b17fee52434956faeef63e7da54dcf2

commit 0ece81599b17fee52434956faeef63e7da54dcf2
Author: Shuhei Takahashi <nya@chromium.org>
Date: Wed Oct 03 08:53:51 2018

cidb: Include branch info on inserting builds.

CL:1231379 updated UpdateMetadata to fill branch info, but the
timing is a bit late to be saved by CI results archiver.

This change instead fill branch info on initial insertion of builds.
After this CL, CL:1231379 can be safely reverted.

BUG= chromium:884225 
TEST=run_tests

Change-Id: If4eabc8c803fe2d544769a58e1e5e8a82844906b
Reviewed-on: https://chromium-review.googlesource.com/1253962
Commit-Ready: Jason Clinton <jclinton@chromium.org>
Tested-by: Shuhei Takahashi <nya@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
(cherry picked from commit 8962d4f57f00203b601e2aa9209ca0676ebd0d00)
Reviewed-on: https://chromium-review.googlesource.com/c/1258626
Reviewed-by: Shuhei Takahashi <nya@chromium.org>
Commit-Queue: Shuhei Takahashi <nya@chromium.org>
Trybot-Ready: Shuhei Takahashi <nya@chromium.org>

[modify] https://crrev.com/0ece81599b17fee52434956faeef63e7da54dcf2/lib/fake_cidb.py
[modify] https://crrev.com/0ece81599b17fee52434956faeef63e7da54dcf2/lib/cidb.py
[modify] https://crrev.com/0ece81599b17fee52434956faeef63e7da54dcf2/cbuildbot/stages/report_stages.py

Blocking: 891633

Sign in to add a comment