From e54287a4aeb21ec8b6b3f084353c9aa9078cd1a8 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Wed, 23 Jan 2019 10:53:39 +0100 Subject: [PATCH] Correctly specify Mac version as 10.13 for iOS simulator tests According to breaking change in https://chromium-review.googlesource.com/c/chromium/tools/build/+/1422562 Similarly to other configs: https://cs.chromium.org/search/?q=Mac-10.1+f:ios+f:json Bug: webrtc:10236 Change-Id: Ia03500a057de784336b225225053dc37dcb6e761 Reviewed-on: https://webrtc-review.googlesource.com/c/119222 Reviewed-by: Mirko Bonadei Commit-Queue: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#26366} --- .../client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json | 7 ++----- .../client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json | 13 ++----------- .../client.webrtc/iOS64_Sim_Debug_(iOS_11.0).json | 7 ++----- .../client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json | 7 ++----- .../ios/tryserver.webrtc/ios_sim_x64_dbg_ios10.json | 7 ++----- .../ios/tryserver.webrtc/ios_sim_x64_dbg_ios11.json | 7 ++----- .../ios/tryserver.webrtc/ios_sim_x64_dbg_ios9.json | 7 ++----- .../ios/tryserver.webrtc/ios_sim_x86_dbg_ios9.json | 7 ++----- 8 files changed, 16 insertions(+), 46 deletions(-) diff --git a/tools_webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json b/tools_webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json index 6bc6f8e9ed..1ba462bbc5 100644 --- a/tools_webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json +++ b/tools_webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json @@ -20,11 +20,8 @@ "include": "common_tests.json", "device type": "iPhone 5", "os": "9.3", - "dimensions": [ - { "os": "Mac-10.13.4", "pool": "Chrome" }, - { "os": "Mac-10.13.5", "pool": "Chrome" }, - { "os": "Mac-10.13.6", "pool": "Chrome" } - ], + "host os": "Mac-10.13", + "pool": "Chrome", "priority": 30 } ] diff --git a/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json index 54f8301601..f9ed62c7fe 100644 --- a/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json +++ b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json @@ -20,17 +20,8 @@ "include": "common_tests.json", "device type": "iPhone 6s", "os": "10.3", - "xcode build version": "8E3004b", - "dimensions": [ - { - "os": "Mac-10.12", - "pool": "Chrome" - }, - { - "os": "Mac-10.13.3", - "pool": "Chrome" - } - ], + "host os": "Mac-10.13", + "pool": "Chrome", "priority": 30 } ] diff --git a/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_11.0).json b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_11.0).json index a139dd86ca..8eee4978ab 100644 --- a/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_11.0).json +++ b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_11.0).json @@ -20,11 +20,8 @@ "include": "common_tests.json", "device type": "iPhone 7", "os": "11.0", - "dimensions": [ - { "os": "Mac-10.13.4", "pool": "Chrome" }, - { "os": "Mac-10.13.5", "pool": "Chrome" }, - { "os": "Mac-10.13.6", "pool": "Chrome" } - ], + "host os": "Mac-10.13", + "pool": "Chrome", "priority": 30 } ] diff --git a/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json index d4c989b349..2217673ea9 100644 --- a/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json +++ b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json @@ -20,11 +20,8 @@ "include": "common_tests.json", "device type": "iPhone 6s", "os": "9.3", - "dimensions": [ - { "os": "Mac-10.13.4", "pool": "Chrome" }, - { "os": "Mac-10.13.5", "pool": "Chrome" }, - { "os": "Mac-10.13.6", "pool": "Chrome" } - ], + "host os": "Mac-10.13", + "pool": "Chrome", "priority": 30 } ] diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios10.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios10.json index d5f77bad94..ebb445b159 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios10.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios10.json @@ -21,11 +21,8 @@ "include": "common_tests.json", "device type": "iPhone 6s", "os": "10.3", - "dimensions": [ - { "os": "Mac-10.13.4", "pool": "Chrome" }, - { "os": "Mac-10.13.5", "pool": "Chrome" }, - { "os": "Mac-10.13.6", "pool": "Chrome" } - ], + "host os": "Mac-10.13", + "pool": "Chrome", "priority": 30 } ] diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios11.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios11.json index 90c4212690..a5208088ae 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios11.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios11.json @@ -21,11 +21,8 @@ "include": "common_tests.json", "device type": "iPhone 7", "os": "11.4", - "dimensions": [ - { "os": "Mac-10.13.4", "pool": "Chrome" }, - { "os": "Mac-10.13.5", "pool": "Chrome" }, - { "os": "Mac-10.13.6", "pool": "Chrome" } - ], + "host os": "Mac-10.13", + "pool": "Chrome", "priority": 30 } ] diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios9.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios9.json index c639ba756b..68b9d7c9bd 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios9.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios9.json @@ -21,11 +21,8 @@ "include": "common_tests.json", "device type": "iPhone 6s", "os": "9.3", - "dimensions": [ - { "os": "Mac-10.13.4", "pool": "Chrome" }, - { "os": "Mac-10.13.5", "pool": "Chrome" }, - { "os": "Mac-10.13.6", "pool": "Chrome" } - ], + "host os": "Mac-10.13", + "pool": "Chrome", "priority": 30 } ] diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x86_dbg_ios9.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x86_dbg_ios9.json index e55519fc76..48eb409eaa 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios_sim_x86_dbg_ios9.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x86_dbg_ios9.json @@ -21,11 +21,8 @@ "include": "common_tests.json", "device type": "iPhone 5", "os": "9.3", - "dimensions": [ - { "os": "Mac-10.13.4", "pool": "Chrome" }, - { "os": "Mac-10.13.5", "pool": "Chrome" }, - { "os": "Mac-10.13.6", "pool": "Chrome" } - ], + "host os": "Mac-10.13", + "pool": "Chrome", "priority": 30 } ]