Skip to content

Commit

Permalink
Move metrics_python_tests from isolated_script to script.
Browse files Browse the repository at this point in the history 
This changes how we invoke metrics_python_tests, so that
it is invoked as a 'script' test and run directly on the builder
(machine doing the compile) rather than as an 'isolated_script'
test under swarming.

This fixes an issue where we'd try to run `dirmd`, which requires
a checkout.

Bug: 1201822
Change-Id: I17c4f6c2341c70b688efc48aada88a5a51ef4a16
Cq-Do-Not-Cancel-Tryjobs: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2921324
Auto-Submit: Dirk Pranke <[email protected]>
Commit-Queue: Dirk Pranke <[email protected]>
Reviewed-by: Alexei Svitkine <[email protected]>
Reviewed-by: Nodir Turakulov <[email protected]>
Reviewed-by: Stephen Martinis <[email protected]>
Cr-Commit-Position: refs/heads/master@{#893147}
  • Loading branch information
@dpranke
dpranke authored and Chromium LUCI CQ committed Jun 16, 2021
1 parent 5d6b07c commit 4c9955b
Show file tree
Hide file tree
Showing 9 changed files with 156 additions and 521 deletions.
44 changes: 0 additions & 44 deletions testing/buildbot/chromium.clang.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23466,28 +23466,6 @@
},
"test_id_prefix": "ninja://chrome/installer/mac:mac_signing_tests/"
},
{
"isolate_name": "metrics_python_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "metrics_python_tests",
"resultdb": {
"enable": true
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Mac-10.15"
}
],
"service_account": "[email protected]"
},
"test_id_prefix": "ninja://tools/metrics:metrics_python_tests/"
},
{
"isolate_name": "mojo_python_unittests",
"merge": {
Expand Down Expand Up @@ -27080,28 +27058,6 @@
},
"test_id_prefix": "ninja://chrome/installer/mac:mac_signing_tests/"
},
{
"isolate_name": "metrics_python_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "metrics_python_tests",
"resultdb": {
"enable": true
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Mac-10.15"
}
],
"service_account": "[email protected]"
},
"test_id_prefix": "ninja://tools/metrics:metrics_python_tests/"
},
{
"isolate_name": "mojo_python_unittests",
"merge": {
Expand Down
122 changes: 32 additions & 90 deletions testing/buildbot/chromium.fyi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@
"script": "headless_python_unittests.py",
"swarming": {}
},
{
"isolate_profile_data": true,
"name": "metrics_python_tests",
"script": "metrics_python_tests.py",
"swarming": {}
},
{
"isolate_profile_data": true,
"name": "webkit_lint",
Expand Down Expand Up @@ -162,6 +168,11 @@
"script": "check_static_initializers.py",
"swarming": {}
},
{
"name": "metrics_python_tests",
"script": "metrics_python_tests.py",
"swarming": {}
},
{
"name": "webkit_lint",
"script": "blink_lint_expectations.py",
Expand Down Expand Up @@ -1758,6 +1769,11 @@
"script": "check_network_annotations.py",
"swarming": {}
},
{
"name": "metrics_python_tests",
"script": "metrics_python_tests.py",
"swarming": {}
},
{
"name": "webkit_lint",
"script": "blink_lint_expectations.py",
Expand All @@ -1775,6 +1791,11 @@
"script": "check_network_annotations.py",
"swarming": {}
},
{
"name": "metrics_python_tests",
"script": "metrics_python_tests.py",
"swarming": {}
},
{
"name": "webkit_lint",
"script": "blink_lint_expectations.py",
Expand Down Expand Up @@ -75673,6 +75694,11 @@
"script": "headless_python_unittests.py",
"swarming": {}
},
{
"name": "metrics_python_tests",
"script": "metrics_python_tests.py",
"swarming": {}
},
{
"name": "webkit_lint",
"script": "blink_lint_expectations.py",
Expand Down Expand Up @@ -77455,27 +77481,6 @@
},
"test_id_prefix": "ninja://tools/grit:grit_python_unittests/"
},
{
"isolate_name": "metrics_python_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "metrics_python_tests",
"resultdb": {
"enable": true
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-18.04"
}
],
"service_account": "[email protected]"
},
"test_id_prefix": "ninja://tools/metrics:metrics_python_tests/"
},
{
"isolate_name": "mojo_python_unittests",
"merge": {
Expand Down Expand Up @@ -79573,28 +79578,6 @@
},
"test_id_prefix": "ninja://tools/grit:grit_python_unittests/"
},
{
"isolate_name": "metrics_python_tests",
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "metrics_python_tests",
"resultdb": {
"enable": true
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-18.04"
}
],
"service_account": "[email protected]"
},
"test_id_prefix": "ninja://tools/metrics:metrics_python_tests/"
},
{
"isolate_name": "mojo_python_unittests",
"isolate_profile_data": true,
Expand Down Expand Up @@ -79845,6 +79828,12 @@
"script": "headless_python_unittests.py",
"swarming": {}
},
{
"isolate_profile_data": true,
"name": "metrics_python_tests",
"script": "metrics_python_tests.py",
"swarming": {}
},
{
"isolate_profile_data": true,
"name": "webkit_lint",
Expand Down Expand Up @@ -84453,29 +84442,6 @@
},
"test_id_prefix": "ninja://chrome/installer/mac:mac_signing_tests/"
},
{
"isolate_name": "metrics_python_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "metrics_python_tests",
"resultdb": {
"enable": true
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "arm64",
"os": "Mac-11",
"pool": "chromium.tests.mac-arm64"
}
],
"service_account": "[email protected]"
},
"test_id_prefix": "ninja://tools/metrics:metrics_python_tests/"
},
{
"isolate_name": "mojo_python_unittests",
"merge": {
Expand Down Expand Up @@ -88006,30 +87972,6 @@
},
"test_id_prefix": "ninja://chrome/installer/mac:mac_signing_tests/"
},
{
"isolate_name": "metrics_python_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "metrics_python_tests",
"resultdb": {
"enable": true
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "8086:0a2e",
"os": "Mac-11.3"
}
],
"expiration": 21600,
"service_account": "[email protected]"
},
"test_id_prefix": "ninja://tools/metrics:metrics_python_tests/"
},
{
"isolate_name": "mojo_python_unittests",
"merge": {
Expand Down
Loading

0 comments on commit 4c9955b

Please sign in to comment.