Skip to content

Commit

Permalink
Reland "[fuchsia] Move content_browsertests to fuchsia_common_gtests"
Browse files Browse the repository at this point in the history 
This is a reland of commit 73659a8

Reason for reland: This now does not enable the tests on DBG/ASAN/clang builders, which were failing when previously enabled.
Additionally, failing release tests have since been disabled/fixed.

Original change's description:
> [fuchsia] Move content_browsertests to fuchsia_common_gtests
>
> fuchsia_common_gtests is used by:
> - fuchsia_gtests
> - fuchsia_web_engine_non_graphical_gtests
>
> fuchsia_gtests is used by:
> - fuchsia-fyi-x64-asan
> - fuchsia-fyi-x64-dbg
> - fuchsia-x64-cast-receiver-rel (has CQ trybot)
> - fuchsia-code-coverage
> - fuchsia-fyi-arm64-cfv2-script
> - fuchsia-fyi-arm64-emu-arg
> - fuchsia-fyi-cfv2-script
>
> fuchsia_web_engine_non_graphical_gtests used by:
> - fuchsia-arm64-cast-receiver-rel (has CQ trybot)
> - fuchsia-arm64-rel
> - fuchsia-fyi-arm64-dbg
>
> Adding 14 shards to ARM64 makes the bot only run an additional 1.5 mins. This is also within 5% increase of capacity. Adding 41 shards to x64 is within 5% increase in capacity as well. These are both within acceptable ranges to not require a new hardware request.
>
> Additionally, adding additional sharding for:
> - fuchsia-arm64-cast-receiver-rel (to run only on //chromecast
> changes)
> - fuchsia-x64-cast-receiver-rel (will replace Fuchsia x64)
>
> This also only runs this test on fuchsia-arm64-cast-receiver-rel
> trybot since capacity is not available on x64 trybot.
>
> Change-Id: Ia4359c87e8e54be80a78f0f36170937e45324bf4
> Bug: 1367370,1373513,1371630,1380163
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3936872
> Reviewed-by: David Dorwin <ddorwin@chromium.org>
> Reviewed-by: Chong Gu <chonggu@google.com>
> Commit-Queue: Rohan Pavone <rohpavone@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1066221}

Bug: 1367370,1373513,1371630,1380163
Change-Id: I5997a3d48545813e0d81ce0d137776cfb7e19fd9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3999045
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Quick-Run: Rohan Pavone <rohpavone@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Auto-Submit: Rohan Pavone <rohpavone@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1068854}
  • Loading branch information
Rohan Pavone authored and Chromium LUCI CQ committed Nov 8, 2022
1 parent 9ac3d96 commit 5958f54
Show file tree
Hide file tree
Showing 4 changed files with 205 additions and 1 deletion.
99 changes: 99 additions & 0 deletions testing/buildbot/chromium.fuchsia.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,31 @@
"test": "compositor_unittests",
"test_id_prefix": "ninja://ui/compositor:compositor_unittests/"
},
{
"args": [
"--test-arg=--disable-gpu",
"--test-arg=--headless",
"--test-arg=--ozone-platform=headless"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-20.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 14
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -1546,6 +1571,31 @@
"test": "compositor_unittests",
"test_id_prefix": "ninja://ui/compositor:compositor_unittests/"
},
{
"args": [
"--test-arg=--disable-gpu",
"--test-arg=--headless",
"--test-arg=--ozone-platform=headless"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-20.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 14
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -2724,6 +2774,31 @@
"test": "compositor_unittests",
"test_id_prefix": "ninja://ui/compositor:compositor_unittests/"
},
{
"args": [
"--test-arg=--disable-gpu",
"--test-arg=--headless",
"--test-arg=--ozone-platform=headless"
],
"ci_only": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-18.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 41
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -4236,6 +4311,30 @@
"test": "compositor_unittests",
"test_id_prefix": "ninja://ui/compositor:compositor_unittests/"
},
{
"args": [
"--test-arg=--disable-gpu",
"--test-arg=--headless",
"--test-arg=--ozone-platform=headless"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-18.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 41
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
},
{
"merge": {
"args": [],
Expand Down
76 changes: 76 additions & 0 deletions testing/buildbot/chromium.fyi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19391,6 +19391,33 @@
"test": "compositor_unittests",
"test_id_prefix": "ninja://ui/compositor:compositor_unittests/"
},
{
"args": [
"--test-arg=--disable-gpu",
"--test-arg=--headless",
"--test-arg=--ozone-platform=headless",
"--ram-size-mb=16384",
"--code-coverage",
"--code-coverage-dir=${ISOLATED_OUTDIR}"
],
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-18.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 14
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
},
{
"args": [
"--ram-size-mb=16384",
Expand Down Expand Up @@ -20928,6 +20955,31 @@
"test": "compositor_unittests",
"test_id_prefix": "ninja://ui/compositor:compositor_unittests/"
},
{
"args": [
"--test-arg=--disable-gpu",
"--test-arg=--headless",
"--test-arg=--ozone-platform=headless"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-20.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 14
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -22234,6 +22286,30 @@
"test": "compositor_unittests",
"test_id_prefix": "ninja://ui/compositor:compositor_unittests/"
},
{
"args": [
"--test-arg=--disable-gpu",
"--test-arg=--headless",
"--test-arg=--ozone-platform=headless"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-18.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 14
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
},
{
"merge": {
"args": [],
Expand Down
21 changes: 20 additions & 1 deletion testing/buildbot/test_suite_exceptions.pyl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1590,6 +1590,12 @@
'content_browsertests': {
'remove_from': [
'CrWinAsan(dll)', # https://crbug.com/935598
# TODO(crbug.com/1371630): Enable on Fuchsia dbg/asan/clang builders.
'fuchsia-fyi-arm64-dbg',
'fuchsia-fyi-x64-asan',
'fuchsia-fyi-x64-dbg',
'ToTFuchsia x64',
'ToTFuchsiaOfficial arm64',
],
'modifications': {
'Cast Audio Linux': {
Expand Down Expand Up @@ -1745,6 +1751,19 @@
'shards': 30,
},
},
'fuchsia-x64-cast-receiver-rel': {
# Temporarily only run this on CI due to resource requirements.
# TODO(crbug.com/1374125): Remove this once resources are available.
'ci_only': True,
'swarming': {
'shards': 41,
},
},
'fuchsia-x64-rel': {
'swarming': {
'shards': 41,
},
},
'linux-chromeos-code-coverage': {
'swarming': {
'shards': 12,
Expand Down Expand Up @@ -2632,7 +2651,7 @@
},
},
'mediapipe_validating_tests': {
'modifications': {
'modifications': {
# TODO(crbug.com/1372213): Remove once tests are stable.
'fuchsia-x64-chrome-rel': {
'experiment_percentage': 100,
Expand Down
10 changes: 10 additions & 0 deletions testing/buildbot/test_suites.pyl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2200,6 +2200,16 @@
},
},
'compositor_unittests': {},
'content_browsertests': {
'args': [
'--test-arg=--disable-gpu',
'--test-arg=--headless',
'--test-arg=--ozone-platform=headless',
],
'swarming': {
'shards': 14,
},
},
'content_unittests': {},
'crypto_unittests': {},
'events_unittests': {},
Expand Down

0 comments on commit 5958f54

Please sign in to comment.