diff --git a/infra/config/config.star b/infra/config/config.star index f3abbcd9d7..6af48c2ded 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -13,7 +13,6 @@ lucicfg.check_version("1.30.9") WEBRTC_GIT = "https://webrtc.googlesource.com/src" WEBRTC_GERRIT = "https://webrtc-review.googlesource.com/src" WEBRTC_TROOPER_EMAIL = "webrtc-troopers-robots@google.com" -WEBRTC_IOS_XCODE_VERSION = "12a7209" WEBRTC_XCODE13 = "13c100" DEFAULT_CPU = "x86-64" @@ -661,15 +660,6 @@ mac_builder, mac_try_job = normal_builder_factory( ) ios_builder, ios_try_job = normal_builder_factory( - dimensions = {"os": "Mac-11"}, - 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", - )], -) - -ios_builder_macos11, ios_try_job_macos11 = normal_builder_factory( dimensions = {"os": "Mac-11"}, properties = {"xcode_build_version": WEBRTC_XCODE13}, caches = [swarming.cache( @@ -718,8 +708,8 @@ ios_builder("iOS64 Sim Debug (iOS 13)", "iOS|x64|13") ios_try_job("ios_sim_x64_dbg_ios13") ios_builder("iOS64 Sim Debug (iOS 12)", "iOS|x64|12") ios_try_job("ios_sim_x64_dbg_ios12") -ios_builder_macos11("iOS API Framework Builder", "iOS|fat|size", recipe = "ios_api_framework", prioritized = True) -ios_try_job_macos11("ios_api_framework", recipe = "ios_api_framework") +ios_builder("iOS API Framework Builder", "iOS|fat|size", recipe = "ios_api_framework", prioritized = True) +ios_try_job("ios_api_framework", recipe = "ios_api_framework") linux_builder("Linux32 Debug", "Linux|x86|dbg") linux_try_job("linux_x86_dbg") diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index 46abbca8ed..5448484ed3 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -1685,13 +1685,13 @@ buckets { ' },' ' "builder_group": "client.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "12a7209"' + ' "xcode_build_version": "13c100"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_12a7209" - path: "xcode_ios_12a7209.app" + name: "xcode_ios_13c100" + path: "xcode_ios_13c100.app" } build_numbers: YES service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1739,13 +1739,13 @@ buckets { ' },' ' "builder_group": "client.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "12a7209"' + ' "xcode_build_version": "13c100"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_12a7209" - path: "xcode_ios_12a7209.app" + name: "xcode_ios_13c100" + path: "xcode_ios_13c100.app" } build_numbers: YES service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1793,13 +1793,13 @@ buckets { ' },' ' "builder_group": "client.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "12a7209"' + ' "xcode_build_version": "13c100"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_12a7209" - path: "xcode_ios_12a7209.app" + name: "xcode_ios_13c100" + path: "xcode_ios_13c100.app" } build_numbers: YES service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1847,13 +1847,13 @@ buckets { ' },' ' "builder_group": "client.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "12a7209"' + ' "xcode_build_version": "13c100"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_12a7209" - path: "xcode_ios_12a7209.app" + name: "xcode_ios_13c100" + path: "xcode_ios_13c100.app" } build_numbers: YES service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -1901,13 +1901,13 @@ buckets { ' },' ' "builder_group": "client.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "12a7209"' + ' "xcode_build_version": "13c100"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_12a7209" - path: "xcode_ios_12a7209.app" + name: "xcode_ios_13c100" + path: "xcode_ios_13c100.app" } build_numbers: YES service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3521,13 +3521,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "12a7209"' + ' "xcode_build_version": "13c100"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_12a7209" - path: "xcode_ios_12a7209.app" + name: "xcode_ios_13c100" + path: "xcode_ios_13c100.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3575,13 +3575,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "12a7209"' + ' "xcode_build_version": "13c100"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_12a7209" - path: "xcode_ios_12a7209.app" + name: "xcode_ios_13c100" + path: "xcode_ios_13c100.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3629,13 +3629,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "12a7209"' + ' "xcode_build_version": "13c100"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_12a7209" - path: "xcode_ios_12a7209.app" + name: "xcode_ios_13c100" + path: "xcode_ios_13c100.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3683,13 +3683,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "12a7209"' + ' "xcode_build_version": "13c100"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_12a7209" - path: "xcode_ios_12a7209.app" + name: "xcode_ios_13c100" + path: "xcode_ios_13c100.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3737,13 +3737,13 @@ buckets { ' },' ' "builder_group": "tryserver.webrtc",' ' "recipe": "webrtc/standalone",' - ' "xcode_build_version": "12a7209"' + ' "xcode_build_version": "13c100"' '}' priority: 30 execution_timeout_secs: 7200 caches { - name: "xcode_ios_12a7209" - path: "xcode_ios_12a7209.app" + name: "xcode_ios_13c100" + path: "xcode_ios_13c100.app" } build_numbers: YES service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"