Skip to content

GitLab

T
tangled
Commit 19c29702 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot
Browse files
Options

Reland "Add several basic gtest & integration tests to new eve-arc-r bot." 

This reverts commit 6bc98538.

Reason for revert: The linked build is 1 week old...

The test is green on tot and does not warrant a revert.

Original change's description:
> Revert "Add several basic gtest & integration tests to new eve-arc-r bot."
>
> This reverts commit fc9217ef.
>
> Reason for revert: chrome_all_tast_tests fails on chromeos-eve-arc-r-chrome,
> https://ci.chromium.org/p/chrome/builders/ci/chromeos-eve-arc-r-chrome/2498
>
>
>
> Original change's description:
> > Add several basic gtest & integration tests to new eve-arc-r bot.
> >
> > Bug: 1092973
> > Change-Id: I4df191266f28297cf8581f1687de87e336713363
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339580
> > Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
> > Reviewed-by: Stephen Martinis <martiniss@chromium.org>
> > Commit-Queue: Ben Pastene <bpastene@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#796071}
>
> TBR=martiniss@chromium.org,bpastene@chromium.org,gbeaty@chromium.org
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 1092973
> Change-Id: Ibaa98c41af45981b5d195ef41db31d541c4ed5dc
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2355088
> Reviewed-by: Lan Wei <lanwei@chromium.org>
> Commit-Queue: Lan Wei <lanwei@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#798055}

TBR=lanwei@chromium.org,martiniss@chromium.org,bpastene@chromium.org,gbeaty@chromium.org

# Not skipping CQ checks because this is a reland.

No-Try: true
Bug: 1092973
Change-Id: I5bd5c1ef4a789ae141ea8ac3fa55883cfa495c7f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2356047
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798149}
parent 72a71f49
Hide whitespace changes
Inline Side-by-side
Showing with 334 additions and 1 deletion
testing/buildbot/chrome.ci.json
View file @ 19c29702
...@@ -1356,6 +1356,166 @@ ...@@ -1356,6 +1356,166 @@
"chromeos-eve-arc-r-chrome": { "chromeos-eve-arc-r-chrome": {
"additional_compile_targets": [ "additional_compile_targets": [
"chromiumos_preflight" "chromiumos_preflight"
],
"gtest_tests": [
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.base_unittests.filter"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"experiment_percentage": 100,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"args": [
"--strip-chrome"
],
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "disk_usage_tast_test",
"test_id_prefix": "ninja://chromeos:disk_usage_tast_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
}
],
"isolated_scripts": [
{
"args": [
"--browser=cros-chrome",
"--remote=variable_chromeos_device_hostname",
"--xvfb"
],
"isolate_name": "telemetry_perf_unittests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "telemetry_perf_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
},
"test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"args": [
"--browser=cros-chrome",
"--remote=variable_chromeos_device_hostname",
"--jobs=1"
],
"isolate_name": "telemetry_unittests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "telemetry_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test_id_prefix": "ninja://chrome/test:telemetry_unittests/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
}
] ]
}, },
"chromeos-eve-chrome": { "chromeos-eve-chrome": {
......
testing/buildbot/chrome.json
View file @ 19c29702
...@@ -726,6 +726,166 @@ ...@@ -726,6 +726,166 @@
"chromeos-eve-arc-r-chrome": { "chromeos-eve-arc-r-chrome": {
"additional_compile_targets": [ "additional_compile_targets": [
"chromiumos_preflight" "chromiumos_preflight"
],
"gtest_tests": [
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.base_unittests.filter"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"experiment_percentage": 100,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"args": [
"--strip-chrome"
],
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "disk_usage_tast_test",
"test_id_prefix": "ninja://chromeos:disk_usage_tast_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
}
],
"isolated_scripts": [
{
"args": [
"--browser=cros-chrome",
"--remote=variable_chromeos_device_hostname",
"--xvfb"
],
"isolate_name": "telemetry_perf_unittests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "telemetry_perf_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
},
"test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"args": [
"--browser=cros-chrome",
"--remote=variable_chromeos_device_hostname",
"--jobs=1"
],
"isolate_name": "telemetry_unittests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "telemetry_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test_id_prefix": "ninja://chrome/test:telemetry_unittests/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
}
] ]
}, },
"chromeos-eve-chrome": { "chromeos-eve-chrome": {
......
testing/buildbot/waterfalls.pyl
View file @ 19c29702
...@@ -59,7 +59,20 @@ ...@@ -59,7 +59,20 @@
'additional_compile_targets': [ 'additional_compile_targets': [
'chromiumos_preflight', 'chromiumos_preflight',
], ],
# TODO(crbug.com/1092973): Add tests once the test fleet is ready. 'test_suites': {
'gtest_tests': 'chromeos_device_gtests',
'isolated_scripts': 'chromeos_remote_device_isolated_tests',
},
'swarming': {
'dimension_sets': [
{
'os': 'ChromeOS',
'device_type': 'eve-arc-r',
'pool': 'chrome.tests',
},
],
},
'os_type': 'chromeos'
}, },
'chromeos-eve-chrome': { 'chromeos-eve-chrome': {
'additional_compile_targets': [ 'additional_compile_targets': [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment