Use standalone recipe for iOS try builders.
This CL is to submit along with https://chromium-review.googlesource.com/c/chromium/tools/build/+/3484059.
Bug: webrtc:12768
Change-Id: I8118a3e6db70d2e9cee04a46a8ccf29414d83c7b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/252980
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
diff --git a/config.star b/config.star
index f4f4d8c..f089c65 100755
--- a/config.star
+++ b/config.star
@@ -15,7 +15,6 @@
WEBRTC_TROOPER_EMAIL = "webrtc-troopers-robots@google.com"
WEBRTC_IOS_XCODE_VERSION = "12a7209"
WEBRTC_XCODE13 = "13a233"
-WEBRTC_IOS_SDK_PROPERTY = {"$depot_tools/osx_sdk": {"sdk_version": WEBRTC_IOS_XCODE_VERSION}}
DEFAULT_CPU = "x86-64"
# Helpers:
@@ -382,7 +381,6 @@
recipe("chromium_trybot")
recipe("run_presubmit")
recipe("webrtc/auto_roll_webrtc_deps")
-recipe("webrtc/ios")
recipe("webrtc/ios_api_framework")
recipe("webrtc/libfuzzer")
recipe("webrtc/standalone")
@@ -645,21 +643,14 @@
dimensions = {"os": "Mac"},
)
-ios_builder = normal_builder_factory(
+ios_builder, ios_try_job = normal_builder_factory(
dimensions = {"os": "Mac-10.15"},
properties = {"xcode_build_version": WEBRTC_IOS_XCODE_VERSION},
caches = [swarming.cache(
name = "xcode_ios_" + WEBRTC_IOS_XCODE_VERSION,
path = "xcode_ios_" + WEBRTC_IOS_XCODE_VERSION + ".app",
)],
-)[0]
-
-ios_try_job = normal_builder_factory(
- dimensions = {"os": "Mac-10.15"},
- recipe = "ios",
- properties = WEBRTC_IOS_SDK_PROPERTY,
- caches = [swarming.cache("osx_sdk")],
-)[1]
+)
ios_builder_macos11, ios_try_job_macos11 = normal_builder_factory(
dimensions = {"os": "Mac-11"},
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index db9f546..55aeece 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3562,9 +3562,6 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
- ' "$depot_tools/osx_sdk": {'
- ' "sdk_version": "12a7209"'
- ' },'
' "$recipe_engine/isolated": {'
' "server": "https://isolateserver.appspot.com"'
' },'
@@ -3576,13 +3573,14 @@
' ]'
' },'
' "builder_group": "tryserver.webrtc",'
- ' "recipe": "webrtc/ios"'
+ ' "recipe": "webrtc/standalone",'
+ ' "xcode_build_version": "12a7209"'
'}'
priority: 30
execution_timeout_secs: 7200
caches {
- name: "osx_sdk"
- path: "osx_sdk"
+ name: "xcode_ios_12a7209"
+ path: "xcode_ios_12a7209.app"
}
build_numbers: YES
service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3618,9 +3616,6 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
- ' "$depot_tools/osx_sdk": {'
- ' "sdk_version": "12a7209"'
- ' },'
' "$recipe_engine/isolated": {'
' "server": "https://isolateserver.appspot.com"'
' },'
@@ -3632,13 +3627,14 @@
' ]'
' },'
' "builder_group": "tryserver.webrtc",'
- ' "recipe": "webrtc/ios"'
+ ' "recipe": "webrtc/standalone",'
+ ' "xcode_build_version": "12a7209"'
'}'
priority: 30
execution_timeout_secs: 7200
caches {
- name: "osx_sdk"
- path: "osx_sdk"
+ name: "xcode_ios_12a7209"
+ path: "xcode_ios_12a7209.app"
}
build_numbers: YES
service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3674,9 +3670,6 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
- ' "$depot_tools/osx_sdk": {'
- ' "sdk_version": "12a7209"'
- ' },'
' "$recipe_engine/isolated": {'
' "server": "https://isolateserver.appspot.com"'
' },'
@@ -3688,13 +3681,14 @@
' ]'
' },'
' "builder_group": "tryserver.webrtc",'
- ' "recipe": "webrtc/ios"'
+ ' "recipe": "webrtc/standalone",'
+ ' "xcode_build_version": "12a7209"'
'}'
priority: 30
execution_timeout_secs: 7200
caches {
- name: "osx_sdk"
- path: "osx_sdk"
+ name: "xcode_ios_12a7209"
+ path: "xcode_ios_12a7209.app"
}
build_numbers: YES
service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3730,9 +3724,6 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
- ' "$depot_tools/osx_sdk": {'
- ' "sdk_version": "12a7209"'
- ' },'
' "$recipe_engine/isolated": {'
' "server": "https://isolateserver.appspot.com"'
' },'
@@ -3744,13 +3735,14 @@
' ]'
' },'
' "builder_group": "tryserver.webrtc",'
- ' "recipe": "webrtc/ios"'
+ ' "recipe": "webrtc/standalone",'
+ ' "xcode_build_version": "12a7209"'
'}'
priority: 30
execution_timeout_secs: 7200
caches {
- name: "osx_sdk"
- path: "osx_sdk"
+ name: "xcode_ios_12a7209"
+ path: "xcode_ios_12a7209.app"
}
build_numbers: YES
service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3786,9 +3778,6 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
- ' "$depot_tools/osx_sdk": {'
- ' "sdk_version": "12a7209"'
- ' },'
' "$recipe_engine/isolated": {'
' "server": "https://isolateserver.appspot.com"'
' },'
@@ -3800,13 +3789,14 @@
' ]'
' },'
' "builder_group": "tryserver.webrtc",'
- ' "recipe": "webrtc/ios"'
+ ' "recipe": "webrtc/standalone",'
+ ' "xcode_build_version": "12a7209"'
'}'
priority: 30
execution_timeout_secs: 7200
caches {
- name: "osx_sdk"
- path: "osx_sdk"
+ name: "xcode_ios_12a7209"
+ path: "xcode_ios_12a7209.app"
}
build_numbers: YES
service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
