[iOS][code coverage] Remove iOS coverage experiment try builders.

The experiment has ended. Removing ios-simulator-code-coverage,
ios-simulator-coverage-exp and ios-simulator-full-configs-coverage-exp
from try builder list.

chromium/tools/build: crrev/c/2578177

Bug: 1090188
Change-Id: I2c6c0a96bbb76c18afa58a5d853e3c09fbbd80a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2577626Reviewed-by: Yuke Liao <liaoyuke@chromium.org>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834523}

infra/config/generated/commit-queue.cfg

@@ -896,17 +896,6 @@ config_groups {
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
-      builders {
-        name: "chromium/try/ios-simulator-code-coverage"
-        includable_only: true
-      }
-      builders {
-        name: "chromium/try/ios-simulator-coverage-exp"
-        experiment_percentage: 3
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+]/docs/.+"
-        location_regexp_exclude: ".+/[+]/infra/config/.+"
-      }
       builders {
         name: "chromium/try/ios-simulator-cronet"
         location_regexp: ".+/[+]/components/cronet/.+"
@@ -922,13 +911,6 @@ config_groups {
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
       }
-      builders {
-        name: "chromium/try/ios-simulator-full-configs-coverage-exp"
-        experiment_percentage: 3
-        location_regexp: ".+/[+]/ios/.+"
-        location_regexp_exclude: ".+/[+]/docs/.+"
-        location_regexp_exclude: ".+/[+]/infra/config/.+"
-      }
       builders {
         name: "chromium/try/ios-simulator-multi-window"
         includable_only: true

infra/config/generated/cq-builders.md

@@ -373,15 +373,6 @@ These builders are run on some percentage of builds. Their results are ignored
 by CQ. These are often used to test new configurations before they are added
 as required builders.
 
-* [ios-simulator-coverage-exp](https://ci.chromium.org/p/chromium/builders/try/ios-simulator-coverage-exp) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+ios-simulator-coverage-exp)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+ios-simulator-coverage-exp))
-  * Experiment percentage: 3
-
-* [ios-simulator-full-configs-coverage-exp](https://ci.chromium.org/p/chromium/builders/try/ios-simulator-full-configs-coverage-exp) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+ios-simulator-full-configs-coverage-exp)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+ios-simulator-full-configs-coverage-exp))
-  * Experiment percentage: 3
-
-  Path regular expressions:
-  * [`//ios/.+`](https://cs.chromium.org/chromium/src/ios/)
-
 * [linux-perfetto-rel](https://ci.chromium.org/p/chromium/builders/try/linux-perfetto-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-perfetto-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-perfetto-rel))
   * Experiment percentage: 100
 

infra/config/generated/cr-buildbucket.cfg

@@ -32046,120 +32046,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "ios-simulator-code-coverage"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builder:ios-simulator-code-coverage"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      properties: "{\"$build/code_coverage\":{\"coverage_exclude_sources\":\"ios_test_files_and_test_utils\",\"coverage_test_types\":[\"unit\"],\"use_clang_coverage\":true},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\",\"xcode_build_version\":\"12a7209\"}"
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      caches {
-        name: "xcode_ios_12a7209"
-        path: "xcode_ios_12a7209.app"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.resultdb.result_sink"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
-            }
-          }
-        }
-      }
-    }
-    builders {
-      name: "ios-simulator-coverage-exp"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builder:ios-simulator-coverage-exp"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      properties: "{\"$build/code_coverage\":{\"coverage_exclude_sources\":\"ios_test_files_and_test_utils\",\"coverage_test_types\":[\"unit\"],\"use_clang_coverage\":true},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\",\"xcode_build_version\":\"12a7209\"}"
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      caches {
-        name: "xcode_ios_12a7209"
-        path: "xcode_ios_12a7209.app"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.resultdb.result_sink"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
-            }
-          }
-        }
-      }
-    }
     builders {
       name: "ios-simulator-cronet"
       swarming_host: "chromium-swarm.appspot.com"
@@ -32274,63 +32160,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "ios-simulator-full-configs-coverage-exp"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builder:ios-simulator-full-configs-coverage-exp"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      properties: "{\"$build/code_coverage\":{\"coverage_exclude_sources\":\"ios_test_files_and_test_utils\",\"coverage_test_types\":[\"unit\"],\"use_clang_coverage\":true},\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\",\"xcode_build_version\":\"12a7209\"}"
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      caches {
-        name: "xcode_ios_12a7209"
-        path: "xcode_ios_12a7209.app"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.resultdb.result_sink"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
-            }
-          }
-        }
-      }
-    }
     builders {
       name: "ios-simulator-multi-window"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/goma-usage.pyl

@@ -3,9 +3,9 @@
 # This is consumed by presubmit checks that need to validate the config
 
 {
-  # 61550 (scheduler total) + 344990 (weighted CQ total)
-  # (weighted CQ total) = 6899.8 (CQ total) * 50 (CQ weight)
-  '*weighted total*': 406540,
+  # 61550 (scheduler total) + 344750 (weighted CQ total)
+  # (weighted CQ total) = 6895 (CQ total) * 50 (CQ weight)
+  '*weighted total*': 406300,
   'scheduler': {
     '*total*': 61550,
     'triggered': {
@@ -545,7 +545,7 @@
     },
   },
   'cq': {
-    '*total*': 6899.8,
+    '*total*': 6895,
     'try/android-binary-size': 150,
     'try/android-cronet-arm-dbg': 80,
     'try/android-lollipop-arm-rel': 150,
@@ -580,16 +580,10 @@
     'try/fuchsia_x64': 80,
     # jobs count assumes an 8-core machine
     'try/ios-simulator': 80,
-    # 80 jobs x 3% experiment
-    # jobs count assumes an 8-core machine
-    'try/ios-simulator-coverage-exp': 2.4,
     # jobs count assumes an 8-core machine
     'try/ios-simulator-cronet': 80,
     # jobs count assumes an 8-core machine
     'try/ios-simulator-full-configs': 80,
-    # 80 jobs x 3% experiment
-    # jobs count assumes an 8-core machine
-    'try/ios-simulator-full-configs-coverage-exp': 2.4,
     'try/linux-blink-rel': 80,
     'try/linux-chromeos-compile-dbg': 80,
     'try/linux-chromeos-rel': 150,

infra/config/generated/luci-milo.cfg

@@ -11978,21 +11978,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/ios-simulator-code-coverage"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/ios-simulator-coverage-exp"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-cronet"
   }
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-full-configs"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/ios-simulator-full-configs-coverage-exp"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-multi-window"
   }
@@ -13113,21 +13104,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/ios-simulator-code-coverage"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/ios-simulator-coverage-exp"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-cronet"
   }
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-full-configs"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/ios-simulator-full-configs-coverage-exp"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/ios-simulator-multi-window"
   }

infra/config/subprojects/chromium/try.star

@@ -1355,23 +1355,6 @@ try_.chromium_mac_ios_builder(
     tryjob = try_.job(),
 )
 
-try_.chromium_mac_ios_builder(
-    name = "ios-simulator-code-coverage",
-    use_clang_coverage = True,
-    coverage_exclude_sources = "ios_test_files_and_test_utils",
-    coverage_test_types = ["unit"],
-    os = os.MAC_10_15,
-)
-
-try_.chromium_mac_ios_builder(
-    name = "ios-simulator-coverage-exp",
-    use_clang_coverage = True,
-    coverage_exclude_sources = "ios_test_files_and_test_utils",
-    coverage_test_types = ["unit"],
-    os = os.MAC_10_15,
-    tryjob = try_.job(experiment_percentage = 3),
-)
-
 try_.chromium_mac_ios_builder(
     name = "ios-simulator-cronet",
     branch_selector = branches.STANDARD_MILESTONE,
@@ -1403,20 +1386,6 @@ try_.chromium_mac_ios_builder(
     ),
 )
 
-try_.chromium_mac_ios_builder(
-    name = "ios-simulator-full-configs-coverage-exp",
-    use_clang_coverage = True,
-    coverage_exclude_sources = "ios_test_files_and_test_utils",
-    coverage_test_types = ["unit"],
-    os = os.MAC_10_15,
-    tryjob = try_.job(
-        experiment_percentage = 3,
-        location_regexp = [
-            ".+/[+]/ios/.+",
-        ],
-    ),
-)
-
 try_.chromium_mac_ios_builder(
     name = "ios-simulator-multi-window",
 )

testing/buildbot/waterfalls.pyl

@@ -2456,20 +2456,6 @@
           'isolated_scripts': 'ios_code_coverage_tests',
         },
       },
-      'ios-simulator-coverage-exp': {
-        'mixins': [
-          'enable_resultdb',
-          'isolate_profile_data',
-          'mac_10.15',
-          'mac_toolchain',
-          'out_dir_arg',
-          'xcode_12a7209',
-          'xctest',
-        ],
-        'test_suites': {
-          'isolated_scripts': 'ios_simulator_tests',
-        },
-      },
       'ios-simulator-cronet': {
         'mixins': [
           'enable_resultdb',
@@ -2483,20 +2469,6 @@
           'isolated_scripts': 'ios_simulator_cronet_tests',
         }
       },
-      'ios-simulator-full-configs-coverage-exp': {
-        'mixins': [
-          'enable_resultdb',
-          'isolate_profile_data',
-          'mac_10.15',
-          'mac_toolchain',
-          'out_dir_arg',
-          'xcode_12a7209',
-          'xctest',
-        ],
-        'test_suites': {
-          'isolated_scripts': 'ios_simulator_full_configs_tests',
-        },
-      },
       'ios-simulator-multi-window': {
         'mixins': [
           'enable_resultdb',

tools/mb/mb_config.pyl

@@ -1039,11 +1039,8 @@
       'ios14-beta-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
       'ios14-sdk-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
       'ios-simulator': 'ios_simulator_rbe_code_coverage_partial_instrumentation_xctest',
-      'ios-simulator-coverage-exp': 'ios_simulator_rbe_code_coverage_partial_instrumentation_xctest',
       'ios-simulator-full-configs': 'ios_simulator_code_coverage_partial_instrumentation_xctest',
-      'ios-simulator-full-configs-coverage-exp': 'ios_simulator_rbe_code_coverage_partial_instrumentation_xctest',
       'ios-simulator-cronet': 'ios_cronet_xctest',
-      'ios-simulator-code-coverage': 'ios_simulator_rbe_code_coverage_partial_instrumentation_xctest',
       'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot_xctest',
       'ios-simulator-noncq': 'ios_simulator_debug_static_rbe_bot_xctest',
       'ios-simulator-multi-window': 'ios_simulator_debug_static_bot_multi_window_xctest',

tools/mb/mb_config_expectations/tryserver.chromium.mac.json

@@ -250,36 +250,6 @@
       "use_goma": true
     }
   },
-  "ios-simulator-code-coverage": {
-    "gn_args": {
-      "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
-      "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
-      "is_component_build": false,
-      "is_debug": true,
-      "symbol_level": 1,
-      "target_cpu": "x64",
-      "target_environment": "simulator",
-      "target_os": "ios",
-      "use_clang_coverage": true,
-      "use_goma": true
-    }
-  },
-  "ios-simulator-coverage-exp": {
-    "gn_args": {
-      "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
-      "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
-      "is_component_build": false,
-      "is_debug": true,
-      "symbol_level": 1,
-      "target_cpu": "x64",
-      "target_environment": "simulator",
-      "target_os": "ios",
-      "use_clang_coverage": true,
-      "use_goma": true
-    }
-  },
   "ios-simulator-cr-recipe": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
@@ -332,21 +302,6 @@
       "use_goma": true
     }
   },
-  "ios-simulator-full-configs-coverage-exp": {
-    "gn_args": {
-      "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
-      "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
-      "is_component_build": false,
-      "is_debug": true,
-      "symbol_level": 1,
-      "target_cpu": "x64",
-      "target_environment": "simulator",
-      "target_os": "ios",
-      "use_clang_coverage": true,
-      "use_goma": true
-    }
-  },
   "ios-simulator-multi-window": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,