From a54171b46b75db5a5090dc69d779937983ac40da Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Thu, 7 Apr 2022 18:15:27 +0200 Subject: [PATCH] Fix failure on 'MacARM64 M1 Release' bot. Error when trying to access the try pool from a ci bot: https://ci.chromium.org/ui/p/webrtc/builders/ci/MacARM64%20M1%20Release/2181/overview Bug: webrtc:13899 Change-Id: Id509fae9b519ec08818861787f98e990479a1a0b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258320 Reviewed-by: Mirko Bonadei Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#36486} --- infra/specs/client.webrtc.json | 36 +++++++++++++++++----------------- infra/specs/mixins.pyl | 3 +-- infra/specs/mixins_webrtc.pyl | 1 - infra/specs/waterfalls.pyl | 6 +++--- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index be876a1cc5..6bbadbd5fc 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -7386,7 +7386,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7408,7 +7408,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7430,7 +7430,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7452,7 +7452,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7474,7 +7474,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7496,7 +7496,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ], "shards": 2 @@ -7519,7 +7519,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ], "shards": 6 @@ -7542,7 +7542,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ], "shards": 4 @@ -7565,7 +7565,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7587,7 +7587,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7609,7 +7609,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7631,7 +7631,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ], "shards": 6 @@ -7654,7 +7654,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7676,7 +7676,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7698,7 +7698,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7720,7 +7720,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ], "shards": 4 @@ -7743,7 +7743,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, @@ -7765,7 +7765,7 @@ { "cpu": "arm64-64-Apple_M1", "os": "Mac", - "pool": "WebRTC-baremetal-try" + "pool": "WebRTC-baremetal" } ] }, diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index cfdd6ef323..2ce49eb4ca 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -167,8 +167,7 @@ 'swarming': { 'dimensions': { 'cpu': 'arm64-64-Apple_M1', - 'os': 'Mac', - 'pool': 'WebRTC-baremetal-try' + 'os': 'Mac' } } }, diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index 8d817ec074..7dc911fb48 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -144,7 +144,6 @@ 'dimensions': { 'cpu': 'arm64-64-Apple_M1', 'os': 'Mac', - 'pool': 'WebRTC-baremetal-try', } } }, diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 36fb01b90d..11a12cb70c 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -184,7 +184,7 @@ }, 'MacARM64 M1 Release': { 'os_type': 'mac', - 'mixins': ['mac-m1', 'resultdb-json-format'], + 'mixins': ['mac-m1', 'baremetal-pool', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, @@ -608,7 +608,7 @@ }, 'mac_dbg_m1': { 'os_type': 'mac', - 'mixins': ['mac-m1', 'resultdb-json-format'], + 'mixins': ['mac-m1', 'baremetal-try-pool', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, @@ -622,7 +622,7 @@ }, 'mac_rel_m1': { 'os_type': 'mac', - 'mixins': ['mac-m1', 'resultdb-json-format'], + 'mixins': ['mac-m1', 'baremetal-try-pool', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', },