Skip to content

GitLab

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

Move every CrOS VM test into pool=chromium.tests. 

This moves the remainder of the tests in pool=chromium.tests.cros.vm to
the main test pool by applying the magic named-cache optional-dimension
to every test/bot that uses the 'chromeos-amd64-generic' mixin.

Bug: 1132206
Change-Id: I94dcaecdb21f2a8b36c432273ef7dc0ae690f4c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490549Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819656}
parent 1fa9702a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 575 additions and 141 deletions
testing/buildbot/chromium.chromiumos.json
View file @ 42906209
This diff is collapsed.
testing/buildbot/chromium.gpu.fyi.json
View file @ 42906209
...@@ -7112,12 +7112,26 @@ ...@@ -7112,12 +7112,26 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86",
"kvm": "1", "kvm": "1",
"os": "Ubuntu-16.04", "os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm" "pool": "chromium.tests"
} }
], ],
"idempotent": false, "idempotent": false,
"named_caches": [
{
"name": "cros_vm",
"path": "magic_cros_vm_cache"
}
],
"optional_dimensions": {
"60": [
{
"caches": "cros_vm"
}
]
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
}, },
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
...@@ -7145,12 +7159,26 @@ ...@@ -7145,12 +7159,26 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86",
"kvm": "1", "kvm": "1",
"os": "Ubuntu-16.04", "os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm" "pool": "chromium.tests"
} }
], ],
"idempotent": false, "idempotent": false,
"named_caches": [
{
"name": "cros_vm",
"path": "magic_cros_vm_cache"
}
],
"optional_dimensions": {
"60": [
{
"caches": "cros_vm"
}
]
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
}, },
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
...@@ -7178,12 +7206,26 @@ ...@@ -7178,12 +7206,26 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86",
"kvm": "1", "kvm": "1",
"os": "Ubuntu-16.04", "os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm" "pool": "chromium.tests"
} }
], ],
"idempotent": false, "idempotent": false,
"named_caches": [
{
"name": "cros_vm",
"path": "magic_cros_vm_cache"
}
],
"optional_dimensions": {
"60": [
{
"caches": "cros_vm"
}
]
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
}, },
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
...@@ -7211,12 +7253,26 @@ ...@@ -7211,12 +7253,26 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86",
"kvm": "1", "kvm": "1",
"os": "Ubuntu-16.04", "os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm" "pool": "chromium.tests"
} }
], ],
"idempotent": false, "idempotent": false,
"named_caches": [
{
"name": "cros_vm",
"path": "magic_cros_vm_cache"
}
],
"optional_dimensions": {
"60": [
{
"caches": "cros_vm"
}
]
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
}, },
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
...@@ -7248,12 +7304,26 @@ ...@@ -7248,12 +7304,26 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86",
"kvm": "1", "kvm": "1",
"os": "Ubuntu-16.04", "os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm" "pool": "chromium.tests"
} }
], ],
"idempotent": false, "idempotent": false,
"named_caches": [
{
"name": "cros_vm",
"path": "magic_cros_vm_cache"
}
],
"optional_dimensions": {
"60": [
{
"caches": "cros_vm"
}
]
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
}, },
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
...@@ -7290,12 +7360,26 @@ ...@@ -7290,12 +7360,26 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86",
"kvm": "1", "kvm": "1",
"os": "Ubuntu-16.04", "os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm" "pool": "chromium.tests"
} }
], ],
"idempotent": false, "idempotent": false,
"named_caches": [
{
"name": "cros_vm",
"path": "magic_cros_vm_cache"
}
],
"optional_dimensions": {
"60": [
{
"caches": "cros_vm"
}
]
},
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
}, },
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
...@@ -7332,12 +7416,26 @@ ...@@ -7332,12 +7416,26 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86",
"kvm": "1", "kvm": "1",
"os": "Ubuntu-16.04", "os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm" "pool": "chromium.tests"
} }
], ],
"idempotent": false, "idempotent": false,
"named_caches": [
{
"name": "cros_vm",
"path": "magic_cros_vm_cache"
}
],
"optional_dimensions": {
"60": [
{
"caches": "cros_vm"
}
]
},
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
}, },
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
...@@ -7366,12 +7464,26 @@ ...@@ -7366,12 +7464,26 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86",
"kvm": "1", "kvm": "1",
"os": "Ubuntu-16.04", "os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm" "pool": "chromium.tests"
} }
], ],
"idempotent": false, "idempotent": false,
"named_caches": [
{
"name": "cros_vm",
"path": "magic_cros_vm_cache"
}
],
"optional_dimensions": {
"60": [
{
"caches": "cros_vm"
}
]
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
}, },
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
...@@ -7399,12 +7511,26 @@ ...@@ -7399,12 +7511,26 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86",
"kvm": "1", "kvm": "1",
"os": "Ubuntu-16.04", "os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm" "pool": "chromium.tests"
} }
], ],
"idempotent": false, "idempotent": false,
"named_caches": [
{
"name": "cros_vm",
"path": "magic_cros_vm_cache"
}
],
"optional_dimensions": {
"60": [
{
"caches": "cros_vm"
}
]
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
}, },
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
...@@ -7433,12 +7559,26 @@ ...@@ -7433,12 +7559,26 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86",
"kvm": "1", "kvm": "1",
"os": "Ubuntu-16.04", "os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm" "pool": "chromium.tests"
} }
], ],
"idempotent": false, "idempotent": false,
"named_caches": [
{
"name": "cros_vm",
"path": "magic_cros_vm_cache"
}
],
"optional_dimensions": {
"60": [
{
"caches": "cros_vm"
}
]
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2 "shards": 2
}, },
testing/buildbot/mixins.pyl
View file @ 42906209
...@@ -217,11 +217,27 @@ ...@@ -217,11 +217,27 @@
}, },
'chromeos-amd64-generic': { 'chromeos-amd64-generic': {
'swarming': { 'swarming': {
'dimensions': { 'dimension_sets': [
'kvm': '1', {
'os': 'Ubuntu-16.04', 'cpu': 'x86',
'pool': 'chromium.tests.cros.vm', 'kvm': '1',
'os': 'Ubuntu-16.04',
'pool': 'chromium.tests',
}
],
'optional_dimensions': {
'60': [
{
'caches': 'cros_vm',
}
],
}, },
'named_caches': [
{
'name': 'cros_vm',
'path': 'magic_cros_vm_cache',
},
],
}, },
}, },
'chromeos-kevin': { 'chromeos-kevin': {
......
testing/buildbot/test_suite_exceptions.pyl
View file @ 42906209
...@@ -1216,33 +1216,6 @@ ...@@ -1216,33 +1216,6 @@
], ],
}, },
'disk_usage_tast_test': { 'disk_usage_tast_test': {
'modifications': {
# TODO(crbug.com/1132206): Apply this to all of the bot's tests if the
# cache affinity works.
'chromeos-amd64-generic-rel': {
'swarming': {
'dimension_sets': [
{
'cpu': 'x86',
'pool': 'chromium.tests',
}
],
'optional_dimensions': {
'60': [
{
'caches': 'cros_vm',
}
],
},
'named_caches': [
{
'name': 'cros_vm',
'path': 'magic_cros_vm_cache',
},
],
},
},
},
# TODO(crbug.com/1077659): Add the test back after it's fixed. # TODO(crbug.com/1077659): Add the test back after it's fixed.
'remove_from': [ 'remove_from': [
'chromeos-kevin-rel', 'chromeos-kevin-rel',
...@@ -2791,31 +2764,6 @@ ...@@ -2791,31 +2764,6 @@
'Win10 Tests x64 (dbg)': { 'Win10 Tests x64 (dbg)': {
'experiment_percentage': 100, # crbug.com/870673 'experiment_percentage': 100, # crbug.com/870673
}, },
# TODO(crbug.com/1132206): Apply this to all of the bot's tests if the
# cache affinity works.
'chromeos-amd64-generic-rel': {
'swarming': {
'dimension_sets': [
{
'cpu': 'x86',
'pool': 'chromium.tests',
}
],
'optional_dimensions': {
'60': [
{
'caches': 'cros_vm',
}
],
},
'named_caches': [
{
'name': 'cros_vm',
'path': 'magic_cros_vm_cache',
},
],
},
},
}, },
'remove_from': [ 'remove_from': [
# crbug.com/936540 # crbug.com/936540
...@@ -2916,33 +2864,6 @@ ...@@ -2916,33 +2864,6 @@
}, },
}, },
'url_unittests': { 'url_unittests': {
'modifications': {
# TODO(crbug.com/1132206): Apply this to all of the bot's tests if the
# cache affinity works.
'chromeos-amd64-generic-rel': {
'swarming': {
'dimension_sets': [
{
'cpu': 'x86',
'pool': 'chromium.tests',
}
],
'optional_dimensions': {
'60': [
{
'caches': 'cros_vm',
}
],
},
'named_caches': [
{
'name': 'cros_vm',
'path': 'magic_cros_vm_cache',
},
],
},
},
},
'remove_from': [ 'remove_from': [
# crbug.com/1054240 # crbug.com/1054240
'Fuchsia ARM64', 'Fuchsia ARM64',
...@@ -3094,30 +3015,9 @@ ...@@ -3094,30 +3015,9 @@
'shards': 6, 'shards': 6,
}, },
}, },
# TODO(crbug.com/1132206): Apply this to all of the bot's tests if the
# cache affinity works.
'chromeos-amd64-generic-rel': { 'chromeos-amd64-generic-rel': {
'swarming': { 'swarming': {
'shards': 12, 'shards': 12,
'dimension_sets': [
{
'cpu': 'x86',
'pool': 'chromium.tests',
}
],
'optional_dimensions': {
'60': [
{
'caches': 'cros_vm',
}
],
},
'named_caches': [
{
'name': 'cros_vm',
'path': 'magic_cros_vm_cache',
},
],
}, },
}, },
}, },
......
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