Skip to content

Commit

Permalink
[M90] Export chromium test results to chrome-luci-data.chromium.*_tes…
Browse files Browse the repository at this point in the history 
…t_results

Also in this CL: stop exporting test results to `luci-resultdb.chromium.gpu_*_test_results` tables

(cherry picked from commit a09ce04)

Bug: 1230801
Change-Id: I06a5552f54158cebbc6aa5c2f6aeaa6d6bb92da5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3068067
Commit-Queue: Chan Li <chanli@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#907841}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3068509
Cr-Commit-Position: refs/branch-heads/4430@{#1550}
Cr-Branched-From: e5ce7dc-refs/heads/master@{#857950}
  • Loading branch information
Chan Li authored and Chromium LUCI CQ committed Aug 3, 2021
1 parent f2d3005 commit 2ab0e8f
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 85 deletions.
90 changes: 27 additions & 63 deletions infra/config/generated/cr-buildbucket.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,10 @@ buckets {
test_results {}
}
bq_exports {
project: "luci-resultdb"
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
}
}
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
Expand Down Expand Up @@ -174,14 +170,10 @@ buckets {
test_results {}
}
bq_exports {
project: "luci-resultdb"
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
}
}
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
Expand Down Expand Up @@ -264,14 +256,10 @@ buckets {
test_results {}
}
bq_exports {
project: "luci-resultdb"
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
}
}
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
Expand Down Expand Up @@ -354,14 +342,10 @@ buckets {
test_results {}
}
bq_exports {
project: "luci-resultdb"
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
}
}
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
Expand Down Expand Up @@ -478,14 +462,10 @@ buckets {
test_results {}
}
bq_exports {
project: "luci-resultdb"
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_try_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
}
}
table: "try_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
Expand Down Expand Up @@ -570,14 +550,10 @@ buckets {
test_results {}
}
bq_exports {
project: "luci-resultdb"
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_try_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
}
}
table: "try_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
Expand Down Expand Up @@ -662,14 +638,10 @@ buckets {
test_results {}
}
bq_exports {
project: "luci-resultdb"
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_try_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
}
}
table: "try_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
Expand Down Expand Up @@ -757,14 +729,10 @@ buckets {
test_results {}
}
bq_exports {
project: "luci-resultdb"
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_try_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
}
}
table: "try_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
Expand Down Expand Up @@ -853,14 +821,10 @@ buckets {
test_results {}
}
bq_exports {
project: "luci-resultdb"
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_try_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
}
}
table: "try_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
Expand Down
16 changes: 5 additions & 11 deletions infra/config/lib/ci.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ def ci_builder(
specifying additional parameters for exporting test results to BigQuery.
Will always upload to the following tables in addition to any tables
specified by the list's elements:
luci-resultdb.chromium.ci_test_results
luci-resultdb.chromium.gpu_ci_test_results
chrome-luci-data.chromium.ci_test_results
chrome-luci-data.chromium.gpu_ci_test_results
experiments - a dict of experiment name to the percentage chance (0-100)
that it will apply to builds generated from this builder.
"""
Expand All @@ -78,19 +78,13 @@ def ci_builder(
notifies = (notifies or []) + ["chromium-tree-closer", "chromium-tree-closer-email"]

merged_resultdb_bigquery_exports = [
# TODO(crbug.com/1230801): Remove when all usages of this table have
# been migrated to `chrome-luci-data.chromium.ci_test_results`.
resultdb.export_test_results(
bq_table = "luci-resultdb.chromium.ci_test_results",
),
resultdb.export_test_results(
bq_table = "luci-resultdb.chromium.gpu_ci_test_results",
predicate = resultdb.test_result_predicate(
# Only match the telemetry_gpu_integration_test and
# fuchsia_telemetry_gpu_integration_test targets.
# Android Telemetry targets also have a suffix added to the end
# denoting the binary that's included, so also catch those with
# [^/]*.
test_id_regexp = "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+",
),
bq_table = "chrome-luci-data.chromium.ci_test_results",
),
resultdb.export_test_results(
bq_table = "chrome-luci-data.chromium.gpu_ci_test_results",
Expand Down
16 changes: 5 additions & 11 deletions infra/config/lib/try.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ def try_builder(
specifying additional parameters for exporting test results to BigQuery.
Will always upload to the following tables in addition to any tables
specified by the list's elements:
luci-resultdb.chromium.try_test_results
luci-resultdb.chromium.gpu_try_test_results
chrome-luci-data.chromium.try_test_results
chrome-luci-data.gpu_try_test_results
"""
if not branches.matches(branch_selector):
return
Expand All @@ -119,19 +119,13 @@ def try_builder(
experiments.setdefault("chromium.resultdb.result_sink.junit_tests", 100)

merged_resultdb_bigquery_exports = [
# TODO(crbug.com/1230801): Remove when all usages of this table have
# been migrated to `chrome-luci-data.chromium.try_test_results`.
resultdb.export_test_results(
bq_table = "luci-resultdb.chromium.try_test_results",
),
resultdb.export_test_results(
bq_table = "luci-resultdb.chromium.gpu_try_test_results",
predicate = resultdb.test_result_predicate(
# Only match the telemetry_gpu_integration_test and
# fuchsia_telemetry_gpu_integration_test targets.
# Android Telemetry targets also have a suffix added to the end
# denoting the binary that's included, so also catch those with
# [^/]*.
test_id_regexp = "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+",
),
bq_table = "chrome-luci-data.chromium.try_test_results",
),
resultdb.export_test_results(
bq_table = "chrome-luci-data.chromium.gpu_try_test_results",
Expand Down

0 comments on commit 2ab0e8f

Please sign in to comment.