Commit 61adfa70 authored by adoneria's avatar adoneria Committed by Commit Bot

[updater] add updater integration tests to run on updater testers.

Bug: 1136646
Change-Id: Ied7820c6c87d71a63796bd90f4f202cd177450c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461905Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Anjali Doneria <adoneria@google.com>
Cr-Commit-Position: refs/heads/master@{#815392}
parent 2635d5bb
...@@ -53582,6 +53582,26 @@ ...@@ -53582,6 +53582,26 @@
"test": "updater_tests", "test": "updater_tests",
"test_id_prefix": "ninja://chrome/updater:updater_tests/" "test_id_prefix": "ninja://chrome/updater:updater_tests/"
} }
],
"isolated_scripts": [
{
"isolate_name": "updater_integration_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "updater_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac-10.10"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
}
] ]
}, },
"mac10.11-omaha-tester-rel": { "mac10.11-omaha-tester-rel": {
...@@ -53603,6 +53623,26 @@ ...@@ -53603,6 +53623,26 @@
"test": "updater_tests", "test": "updater_tests",
"test_id_prefix": "ninja://chrome/updater:updater_tests/" "test_id_prefix": "ninja://chrome/updater:updater_tests/"
} }
],
"isolated_scripts": [
{
"isolate_name": "updater_integration_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "updater_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac-10.11"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
}
] ]
}, },
"mac10.12-blink-rel-dummy": { "mac10.12-blink-rel-dummy": {
...@@ -53659,6 +53699,27 @@ ...@@ -53659,6 +53699,27 @@
"test": "updater_tests", "test": "updater_tests",
"test_id_prefix": "ninja://chrome/updater:updater_tests/" "test_id_prefix": "ninja://chrome/updater:updater_tests/"
} }
],
"isolated_scripts": [
{
"isolate_name": "updater_integration_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "updater_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
}
] ]
}, },
"mac10.13-blink-rel-dummy": { "mac10.13-blink-rel-dummy": {
...@@ -53715,6 +53776,26 @@ ...@@ -53715,6 +53776,26 @@
"test": "updater_tests", "test": "updater_tests",
"test_id_prefix": "ninja://chrome/updater:updater_tests/" "test_id_prefix": "ninja://chrome/updater:updater_tests/"
} }
],
"isolated_scripts": [
{
"isolate_name": "updater_integration_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "updater_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac-10.13.6"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
}
] ]
}, },
"mac10.14-blink-rel-dummy": { "mac10.14-blink-rel-dummy": {
...@@ -53770,6 +53851,26 @@ ...@@ -53770,6 +53851,26 @@
"test": "updater_tests", "test": "updater_tests",
"test_id_prefix": "ninja://chrome/updater:updater_tests/" "test_id_prefix": "ninja://chrome/updater:updater_tests/"
} }
],
"isolated_scripts": [
{
"isolate_name": "updater_integration_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "updater_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac-10.14.6"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
}
] ]
}, },
"mac10.15-blink-rel-dummy": { "mac10.15-blink-rel-dummy": {
...@@ -53826,6 +53927,26 @@ ...@@ -53826,6 +53927,26 @@
"test": "updater_tests", "test": "updater_tests",
"test_id_prefix": "ninja://chrome/updater:updater_tests/" "test_id_prefix": "ninja://chrome/updater:updater_tests/"
} }
],
"isolated_scripts": [
{
"isolate_name": "updater_integration_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "updater_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
}
] ]
}, },
"mac11.0-blink-rel-dummy": { "mac11.0-blink-rel-dummy": {
...@@ -55311,6 +55432,28 @@ ...@@ -55311,6 +55432,28 @@
"test": "updater_tests", "test": "updater_tests",
"test_id_prefix": "ninja://chrome/updater:updater_tests/" "test_id_prefix": "ninja://chrome/updater:updater_tests/"
} }
],
"isolated_scripts": [
{
"isolate_name": "updater_integration_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "updater_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"integrity": "high",
"os": "Windows-10"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
}
] ]
}, },
"win7-blink-rel-dummy": { "win7-blink-rel-dummy": {
...@@ -55367,6 +55510,28 @@ ...@@ -55367,6 +55510,28 @@
"test": "updater_tests", "test": "updater_tests",
"test_id_prefix": "ninja://chrome/updater:updater_tests/" "test_id_prefix": "ninja://chrome/updater:updater_tests/"
} }
],
"isolated_scripts": [
{
"isolate_name": "updater_integration_tests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "updater_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"integrity": "high",
"os": "Windows-7-SP1"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
}
] ]
} }
} }
...@@ -4163,6 +4163,10 @@ ...@@ -4163,6 +4163,10 @@
'updater_tests': {}, 'updater_tests': {},
}, },
'updater_isolated_scripts': {
'updater_integration_tests': {},
},
'upload_perfetto': { 'upload_perfetto': {
'upload_trace_processor': {}, 'upload_trace_processor': {},
}, },
......
...@@ -2605,6 +2605,7 @@ ...@@ -2605,6 +2605,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'updater_gtests', 'gtest_tests': 'updater_gtests',
'isolated_scripts': 'updater_isolated_scripts',
}, },
}, },
'mac10.11-omaha-tester-rel': { 'mac10.11-omaha-tester-rel': {
...@@ -2613,6 +2614,7 @@ ...@@ -2613,6 +2614,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'updater_gtests', 'gtest_tests': 'updater_gtests',
'isolated_scripts': 'updater_isolated_scripts',
}, },
}, },
'mac10.12-blink-rel-dummy': { 'mac10.12-blink-rel-dummy': {
...@@ -2635,6 +2637,7 @@ ...@@ -2635,6 +2637,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'updater_gtests', 'gtest_tests': 'updater_gtests',
'isolated_scripts': 'updater_isolated_scripts',
}, },
}, },
'mac10.13-blink-rel-dummy': { 'mac10.13-blink-rel-dummy': {
...@@ -2660,6 +2663,7 @@ ...@@ -2660,6 +2663,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'updater_gtests', 'gtest_tests': 'updater_gtests',
'isolated_scripts': 'updater_isolated_scripts',
}, },
}, },
'mac10.14-blink-rel-dummy': { 'mac10.14-blink-rel-dummy': {
...@@ -2679,6 +2683,7 @@ ...@@ -2679,6 +2683,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'updater_gtests', 'gtest_tests': 'updater_gtests',
'isolated_scripts': 'updater_isolated_scripts',
}, },
}, },
'mac10.15-blink-rel-dummy': { 'mac10.15-blink-rel-dummy': {
...@@ -2704,6 +2709,7 @@ ...@@ -2704,6 +2709,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'updater_gtests', 'gtest_tests': 'updater_gtests',
'isolated_scripts': 'updater_isolated_scripts',
}, },
}, },
'mac11.0-blink-rel-dummy': { 'mac11.0-blink-rel-dummy': {
...@@ -2771,6 +2777,7 @@ ...@@ -2771,6 +2777,7 @@
'win10-omaha-tester-rel': { 'win10-omaha-tester-rel': {
'test_suites': { 'test_suites': {
'gtest_tests': 'updater_gtests', 'gtest_tests': 'updater_gtests',
'isolated_scripts': 'updater_isolated_scripts',
}, },
'swarming': { 'swarming': {
'dimension_sets': [ 'dimension_sets': [
...@@ -2802,6 +2809,7 @@ ...@@ -2802,6 +2809,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'updater_gtests', 'gtest_tests': 'updater_gtests',
'isolated_scripts': 'updater_isolated_scripts',
}, },
'swarming': { 'swarming': {
'dimension_sets': [ 'dimension_sets': [
......
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