Commit 42906209 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

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
......@@ -72,11 +72,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "aura_unittests",
......@@ -91,11 +105,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "base_unittests",
......@@ -114,11 +142,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "capture_unittests",
......@@ -133,11 +175,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "cc_unittests",
......@@ -155,12 +211,26 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "chrome_all_tast_tests",
......@@ -178,11 +248,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "cros_browser_sanity_test",
......@@ -197,11 +281,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "crypto_unittests",
......@@ -252,11 +350,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "display_unittests",
......@@ -271,11 +383,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "google_apis_unittests",
......@@ -295,11 +421,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "interactive_ui_tests",
......@@ -314,11 +454,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "ipc_tests",
......@@ -333,11 +487,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "jingle_unittests",
......@@ -352,11 +520,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "latency_unittests",
......@@ -371,11 +553,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "libcups_unittests",
......@@ -393,11 +589,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "media_unittests",
......@@ -412,11 +622,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "midi_unittests",
......@@ -431,11 +655,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "mojo_unittests",
......@@ -460,11 +698,25 @@
],
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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",
"shards": 3
},
......@@ -483,11 +735,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "ozone_gl_unittests",
......@@ -502,11 +768,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "ozone_unittests",
......@@ -521,11 +801,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "pdf_unittests",
......@@ -540,11 +834,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "printing_unittests",
......@@ -559,11 +867,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "profile_provider_unittest",
......@@ -578,11 +900,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "sandbox_linux_unittests",
......@@ -597,11 +933,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "sql_unittests",
......@@ -665,11 +1015,25 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test": "vaapi_unittest",
......@@ -694,12 +1058,26 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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",
"shards": 6
},
......
......@@ -7112,12 +7112,26 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
......@@ -7145,12 +7159,26 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
......@@ -7178,12 +7206,26 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
......@@ -7211,12 +7253,26 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
......@@ -7248,12 +7304,26 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
......@@ -7290,12 +7360,26 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
......@@ -7332,12 +7416,26 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
......@@ -7366,12 +7464,26 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
......@@ -7399,12 +7511,26 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
......@@ -7433,12 +7559,26 @@
"containment_type": "AUTO",
"dimension_sets": [
{
"cpu": "x86",
"kvm": "1",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.cros.vm"
"pool": "chromium.tests"
}
],
"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",
"shards": 2
},
......@@ -217,11 +217,27 @@
},
'chromeos-amd64-generic': {
'swarming': {
'dimensions': {
'kvm': '1',
'os': 'Ubuntu-16.04',
'pool': 'chromium.tests.cros.vm',
'dimension_sets': [
{
'cpu': 'x86',
'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': {
......
......@@ -1216,33 +1216,6 @@
],
},
'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.
'remove_from': [
'chromeos-kevin-rel',
......@@ -2791,31 +2764,6 @@
'Win10 Tests x64 (dbg)': {
'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': [
# crbug.com/936540
......@@ -2916,33 +2864,6 @@
},
},
'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': [
# crbug.com/1054240
'Fuchsia ARM64',
......@@ -3094,30 +3015,9 @@
'shards': 6,
},
},
# TODO(crbug.com/1132206): Apply this to all of the bot's tests if the
# cache affinity works.
'chromeos-amd64-generic-rel': {
'swarming': {
'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