From f81d8efb249a87cbab5ace6657a6e4a6d4f5022f Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Fri, 30 Dec 2016 08:26:24 +0100 Subject: [PATCH] Promote iOS Simulator 9.0 bot to main waterfall. Rename existing iOS Simulator bots to match the new one. Buildbot changes: https://chromium-review.googlesource.com/423055 BUG=chromium:677385 TBR=ehmaldonado@webrtc.org Review-Url: https://codereview.webrtc.org/2601353003 . Cr-Commit-Position: refs/heads/master@{#15842} --- infra/config/cq.cfg | 5 +++-- tools-webrtc/mb/mb_config.pyl | 10 +++++----- .../iOS32_Sim_Debug_(iOS_9.0).json | 0 ...ator_Debug.json => iOS64_Sim_Debug_(iOS_10.0).json} | 0 ...lator_Debug.json => iOS64_Sim_Debug_(iOS_9.0).json} | 6 +++--- .../{ios32_sim_dbg.json => ios32_sim_ios9_dbg.json} | 6 +++--- .../{ios64_sim_dbg.json => ios64_sim_ios10_dbg.json} | 0 7 files changed, 14 insertions(+), 13 deletions(-) rename webrtc/build/ios/{client.webrtc.fyi => client.webrtc}/iOS32_Sim_Debug_(iOS_9.0).json (100%) rename webrtc/build/ios/client.webrtc/{iOS64_Simulator_Debug.json => iOS64_Sim_Debug_(iOS_10.0).json} (100%) rename webrtc/build/ios/client.webrtc/{iOS32_Simulator_Debug.json => iOS64_Sim_Debug_(iOS_9.0).json} (85%) rename webrtc/build/ios/tryserver.webrtc/{ios32_sim_dbg.json => ios32_sim_ios9_dbg.json} (86%) rename webrtc/build/ios/tryserver.webrtc/{ios64_sim_dbg.json => ios64_sim_ios10_dbg.json} (100%) diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg index 01a45f64ed..8f9707fc17 100644 --- a/infra/config/cq.cfg +++ b/infra/config/cq.cfg @@ -39,8 +39,9 @@ verifiers { builders { name: "ios_arm64_rel" } builders { name: "ios_dbg" } builders { name: "ios_rel" } - builders { name: "ios32_sim_dbg" } - builders { name: "ios64_sim_dbg" } + builders { name: "ios32_sim_ios9_dbg" } + builders { name: "ios64_sim_ios9_dbg" } + builders { name: "ios64_sim_ios10_dbg" } builders { name: "ios_api_framework" } builders { name: "linux_arm" } builders { name: "linux_asan" } diff --git a/tools-webrtc/mb/mb_config.pyl b/tools-webrtc/mb/mb_config.pyl index b310d1c979..623c1d3bb3 100644 --- a/tools-webrtc/mb/mb_config.pyl +++ b/tools-webrtc/mb/mb_config.pyl @@ -24,8 +24,9 @@ 'iOS32 Release': 'ios_release_bot_arm_device', 'iOS64 Debug': 'ios_debug_static_bot_arm64_device', 'iOS64 Release': 'ios_release_bot_arm64_device', - 'iOS32 Simulator Debug': 'ios_debug_static_bot_x86', - 'iOS64 Simulator Debug': 'ios_debug_static_bot_x64', + 'iOS32 Sim Debug (iOS 9.0)': 'ios_debug_static_bot_x86', + 'iOS64 Sim Debug (iOS 9.0)': 'ios_debug_static_bot_x64', + 'iOS64 Sim Debug (iOS 10.0)': 'ios_debug_static_bot_x64', # Mac 'Mac64 Debug': 'debug_bot_x64', @@ -88,7 +89,6 @@ 'client.webrtc.fyi': { # Mac 'Mac (swarming)': 'release_bot_x64', - 'iOS32 Sim Debug (iOS 9.0)': 'ios_debug_static_bot_x86', # Linux 'Linux64 GCC': 'gcc_release_bot_x64', @@ -109,9 +109,9 @@ 'ios_rel': 'ios_release_bot_arm_device', 'ios_arm64_dbg': 'ios_debug_static_bot_arm64_device', 'ios_arm64_rel': 'ios_release_bot_arm64_device', - 'ios32_sim_dbg': 'ios_debug_static_bot_x86', - 'ios64_sim_dbg': 'ios_debug_static_bot_x64', + 'ios32_sim_ios9_dbg': 'ios_debug_static_bot_x86', 'ios64_sim_ios9_dbg': 'ios_debug_static_bot_x64', + 'ios64_sim_ios10_dbg': 'ios_debug_static_bot_x64', # Mac 'mac_compile_dbg': 'debug_bot_x64', diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS32_Sim_Debug_(iOS_9.0).json b/webrtc/build/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json similarity index 100% rename from webrtc/build/ios/client.webrtc.fyi/iOS32_Sim_Debug_(iOS_9.0).json rename to webrtc/build/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json diff --git a/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json b/webrtc/build/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json similarity index 100% rename from webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json rename to webrtc/build/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json diff --git a/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json b/webrtc/build/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json similarity index 85% rename from webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json rename to webrtc/build/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json index 959a9b4e2e..cbd05e5b59 100644 --- a/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json +++ b/webrtc/build/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json @@ -3,7 +3,7 @@ "kjellander" ], "comments": [ - "Tests for 32-bit iOS simulators.", + "Tests for 64-bit iOS simulators.", "gn_args in this file is only read by the buildbot recipe; ", "webrtc/build/mb_config.pyl contains the actual build configuration.", "TODO(kjellander): remove gn_args when the recipe is updated." @@ -15,12 +15,12 @@ "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Debug", - "sdk": "iphonesimulator10.0", + "sdk": "iphonesimulator9.0", "tests": [ { "include": "common_tests.json", "device type": "iPhone 6s", - "os": "10.0" + "os": "9.0" } ] } diff --git a/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json similarity index 86% rename from webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json rename to webrtc/build/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json index 782f1613a8..7633db9f18 100644 --- a/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json +++ b/webrtc/build/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json @@ -16,12 +16,12 @@ "compiler": "ninja", "additional_compile_targets": [ "all" ], "configuration": "Debug", - "sdk": "iphonesimulator10.0", + "sdk": "iphonesimulator9.0", "tests": [ { "include": "common_tests.json", - "device type": "iPhone 6s", - "os": "10.0" + "device type": "iPhone 5", + "os": "9.0" } ] } diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json similarity index 100% rename from webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json rename to webrtc/build/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json