diff --git a/commit-queue.cfg b/commit-queue.cfg index 7195cff56..4a8d77f41 100644 --- a/commit-queue.cfg +++ b/commit-queue.cfg @@ -73,18 +73,12 @@ config_groups { builders { name: "libyuv/try/android_x86" } - builders { - name: "libyuv/try/ios" - } builders { name: "libyuv/try/ios_arm64" } builders { name: "libyuv/try/ios_arm64_rel" } - builders { - name: "libyuv/try/ios_rel" - } builders { name: "libyuv/try/linux" } diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg index 5e425ff9b..08ac90abf 100644 --- a/cr-buildbucket.cfg +++ b/cr-buildbucket.cfg @@ -1045,72 +1045,6 @@ buckets { value: 100 } } - builders { - name: "iOS Debug" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" - dimensions: "pool:luci.flex.ci" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/goma": {' - ' "server_host": "goma.chromium.org",' - ' "use_luci_auth": true' - ' },' - ' "builder_group": "client.libyuv",' - ' "recipe": "libyuv/libyuv"' - '}' - execution_timeout_secs: 10800 - build_numbers: YES - service_account: "libyuv-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - experiments { - key: "luci.use_realms" - value: 100 - } - } - builders { - name: "iOS Release" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" - dimensions: "pool:luci.flex.ci" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/goma": {' - ' "server_host": "goma.chromium.org",' - ' "use_luci_auth": true' - ' },' - ' "builder_group": "client.libyuv",' - ' "recipe": "libyuv/libyuv"' - '}' - execution_timeout_secs: 10800 - build_numbers: YES - service_account: "libyuv-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - experiments { - key: "luci.use_realms" - value: 100 - } - } } } buckets { @@ -1337,39 +1271,6 @@ buckets { value: 100 } } - builders { - name: "ios" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" - dimensions: "pool:luci.flex.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/goma": {' - ' "server_host": "goma.chromium.org",' - ' "use_luci_auth": true' - ' },' - ' "builder_group": "tryserver.libyuv",' - ' "recipe": "libyuv/libyuv"' - '}' - execution_timeout_secs: 10800 - build_numbers: YES - service_account: "libyuv-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - experiments { - key: "luci.use_realms" - value: 100 - } - } builders { name: "ios_arm64" swarming_host: "chromium-swarm.appspot.com" @@ -1436,39 +1337,6 @@ buckets { value: 100 } } - builders { - name: "ios_rel" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" - dimensions: "pool:luci.flex.try" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/goma": {' - ' "server_host": "goma.chromium.org",' - ' "use_luci_auth": true' - ' },' - ' "builder_group": "tryserver.libyuv",' - ' "recipe": "libyuv/libyuv"' - '}' - execution_timeout_secs: 10800 - build_numbers: YES - service_account: "libyuv-try-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - experiments { - key: "luci.use_realms" - value: 100 - } - } builders { name: "linux" swarming_host: "chromium-swarm.appspot.com" diff --git a/luci-milo.cfg b/luci-milo.cfg index 85eab3744..baf786f21 100644 --- a/luci-milo.cfg +++ b/luci-milo.cfg @@ -156,16 +156,6 @@ consoles { category: "iOS|ARM64" short_name: "rel" } - builders { - name: "buildbucket/luci.libyuv.ci/iOS Debug" - category: "iOS" - short_name: "dbg" - } - builders { - name: "buildbucket/luci.libyuv.ci/iOS Release" - category: "iOS" - short_name: "rel" - } include_experimental_builds: true } consoles { @@ -194,18 +184,12 @@ consoles { builders { name: "buildbucket/luci.libyuv.try/android_x86" } - builders { - name: "buildbucket/luci.libyuv.try/ios" - } builders { name: "buildbucket/luci.libyuv.try/ios_arm64" } builders { name: "buildbucket/luci.libyuv.try/ios_arm64_rel" } - builders { - name: "buildbucket/luci.libyuv.try/ios_rel" - } builders { name: "buildbucket/luci.libyuv.try/linux" } diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg index 6fd26e200..efa259a17 100644 --- a/luci-scheduler.cfg +++ b/luci-scheduler.cfg @@ -327,26 +327,6 @@ job { builder: "iOS ARM64 Release" } } -job { - id: "iOS Debug" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" - builder: "iOS Debug" - } -} -job { - id: "iOS Release" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "luci.libyuv.ci" - builder: "iOS Release" - } -} trigger { id: "master-gitiles-trigger" realm: "ci" @@ -378,8 +358,6 @@ trigger { triggers: "Win64 Release (Clang)" triggers: "iOS ARM64 Debug" triggers: "iOS ARM64 Release" - triggers: "iOS Debug" - triggers: "iOS Release" gitiles { repo: "https://chromium.googlesource.com/libyuv/libyuv" refs: "regexp:refs/heads/main" diff --git a/main.star b/main.star index e47c3d727..2db1ddb30 100755 --- a/main.star +++ b/main.star @@ -330,8 +330,6 @@ ci_builder("Win64 Release", "win", "Win|64|Release") ci_builder("Win64 Release (Clang)", "win", "Win|64|Release", "clg") ci_builder("iOS ARM64 Debug", "ios", "iOS|ARM64", "dbg") ci_builder("iOS ARM64 Release", "ios", "iOS|ARM64", "rel") -ci_builder("iOS Debug", "ios", "iOS", "dbg") -ci_builder("iOS Release", "ios", "iOS", "rel") # TODO(crbug.com/1242847): make this not experimental. try_builder("android", "android", experiment_percentage = 100) @@ -340,10 +338,8 @@ try_builder("android_rel", "android", experiment_percentage = 100) try_builder("android_x64", "linux") try_builder("android_x86", "linux") -try_builder("ios", "ios") try_builder("ios_arm64", "ios") try_builder("ios_arm64_rel", "ios") -try_builder("ios_rel", "ios") try_builder("linux", "linux") try_builder("linux_asan", "linux") try_builder("linux_gcc", "linux", experiment_percentage = 100)