Switch all the Nexus 5X configs to Pixel 2
Bug: chromium:1418460 Change-Id: If521a3c8d40d329833cd95842c190cae0c0861de Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/61725 Reviewed-by: Bob Beck <bbe@google.com>
This commit is contained in:
@@ -13,7 +13,7 @@ buckets {
|
||||
builders {
|
||||
name: "android_aarch64"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "device_type:bullhead"
|
||||
dimensions: "device_type:walleye"
|
||||
dimensions: "pool:luci.flex.ci"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
@@ -127,7 +127,7 @@ buckets {
|
||||
builders {
|
||||
name: "android_aarch64_rel"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "device_type:bullhead"
|
||||
dimensions: "device_type:walleye"
|
||||
dimensions: "pool:luci.flex.ci"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
@@ -165,7 +165,7 @@ buckets {
|
||||
builders {
|
||||
name: "android_arm"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "device_type:bullhead"
|
||||
dimensions: "device_type:walleye"
|
||||
dimensions: "pool:luci.flex.ci"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
@@ -203,7 +203,7 @@ buckets {
|
||||
builders {
|
||||
name: "android_arm_armmode_rel"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "device_type:bullhead"
|
||||
dimensions: "device_type:walleye"
|
||||
dimensions: "pool:luci.flex.ci"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
@@ -282,7 +282,7 @@ buckets {
|
||||
builders {
|
||||
name: "android_arm_rel"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "device_type:bullhead"
|
||||
dimensions: "device_type:walleye"
|
||||
dimensions: "pool:luci.flex.ci"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
@@ -2094,7 +2094,7 @@ buckets {
|
||||
builders {
|
||||
name: "android_aarch64"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "device_type:bullhead"
|
||||
dimensions: "device_type:walleye"
|
||||
dimensions: "pool:luci.flex.try"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
@@ -2265,7 +2265,7 @@ buckets {
|
||||
builders {
|
||||
name: "android_aarch64_rel"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "device_type:bullhead"
|
||||
dimensions: "device_type:walleye"
|
||||
dimensions: "pool:luci.flex.try"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
@@ -2322,7 +2322,7 @@ buckets {
|
||||
builders {
|
||||
name: "android_arm"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "device_type:bullhead"
|
||||
dimensions: "device_type:walleye"
|
||||
dimensions: "pool:luci.flex.try"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
@@ -2349,7 +2349,7 @@ buckets {
|
||||
builders {
|
||||
name: "android_arm_armmode_rel"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "device_type:bullhead"
|
||||
dimensions: "device_type:walleye"
|
||||
dimensions: "pool:luci.flex.try"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
@@ -2499,7 +2499,7 @@ buckets {
|
||||
builders {
|
||||
name: "android_arm_rel"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "device_type:bullhead"
|
||||
dimensions: "device_type:walleye"
|
||||
dimensions: "pool:luci.flex.try"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
|
||||
@@ -276,13 +276,6 @@ WIN_HOST = {
|
||||
# The Android tests take longer to run. See https://crbug.com/900953.
|
||||
ANDROID_TIMEOUT = 60 * time.minute
|
||||
|
||||
BULLHEAD_HOST = {
|
||||
"dimensions": {
|
||||
"device_type": "bullhead", # Nexus 5X
|
||||
},
|
||||
"execution_timeout": ANDROID_TIMEOUT,
|
||||
}
|
||||
|
||||
WALLEYE_HOST = {
|
||||
"dimensions": {
|
||||
"device_type": "walleye", # Pixel 2
|
||||
@@ -299,7 +292,7 @@ SDE_TIMEOUT = 60 * time.minute
|
||||
|
||||
both_builders(
|
||||
"android_aarch64",
|
||||
BULLHEAD_HOST,
|
||||
WALLEYE_HOST,
|
||||
category = "android|aarch64",
|
||||
short_name = "dbg",
|
||||
cq_compile_only = LINUX_HOST,
|
||||
@@ -313,7 +306,7 @@ both_builders(
|
||||
)
|
||||
both_builders(
|
||||
"android_aarch64_rel",
|
||||
BULLHEAD_HOST,
|
||||
WALLEYE_HOST,
|
||||
category = "android|aarch64",
|
||||
short_name = "rel",
|
||||
cq_compile_only = LINUX_HOST,
|
||||
@@ -368,7 +361,7 @@ both_builders(
|
||||
|
||||
both_builders(
|
||||
"android_arm",
|
||||
BULLHEAD_HOST,
|
||||
WALLEYE_HOST,
|
||||
category = "android|thumb",
|
||||
short_name = "dbg",
|
||||
cq_compile_only = LINUX_HOST,
|
||||
@@ -386,7 +379,7 @@ both_builders(
|
||||
)
|
||||
both_builders(
|
||||
"android_arm_rel",
|
||||
BULLHEAD_HOST,
|
||||
WALLEYE_HOST,
|
||||
category = "android|thumb",
|
||||
short_name = "rel",
|
||||
cq_compile_only = LINUX_HOST,
|
||||
@@ -424,7 +417,7 @@ both_builders(
|
||||
)
|
||||
both_builders(
|
||||
"android_arm_armmode_rel",
|
||||
BULLHEAD_HOST,
|
||||
WALLEYE_HOST,
|
||||
category = "android|arm",
|
||||
short_name = "rel",
|
||||
cq_compile_only = LINUX_HOST,
|
||||
|
||||
Reference in New Issue
Block a user