[4472][mac][infra] Add branch_selector for Mac11 Tests

Added |branch_selector = branches.STANDARD_MILESTONE,| to Mac11 Tests so the LUCI components in M91 waterfall could work. The change also removes android code coverage experiment builder in M91 CI to fix the presubmit check. Bug: 1194128 Change-Id: I6d41ece564418b335f3e5f15458d80b2c88991ce Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2824788 Reviewed-by: Garrett Beaty <gbeaty@chromium.org> Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org> Cr-Commit-Position: refs/branch-heads/4472@{#46} Cr-Branched-From: 3d60439-refs/heads/master@{#870763}
chromium · Apr 13, 2021 · 1663985 · 1663985
1 parent 6d0e98c
commit 1663985
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 161 deletions.
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg
@@ -112,13 +112,6 @@ config_groups {
         name: "chromium-m91/try/android-official"
         includable_only: true
       }
-      builders {
-        name: "chromium-m91/try/android-pie-arm64-coverage-experimental-rel"
-        experiment_percentage: 3
-        location_regexp: ".*"
-        location_regexp_exclude: ".+/[+]/docs/.+"
-        location_regexp_exclude: ".+/[+]/infra/config/.+"
-      }
       builders {
         name: "chromium-m91/try/android-pie-arm64-dbg"
         location_regexp: ".+/[+]/chrome/android/features/vr/.+"

diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
@@ -3370,6 +3370,68 @@ buckets {
         }
       }
     }
+    builders {
+      name: "Mac11 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mac\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.gtests_local"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 10
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
     builders {
       name: "Marshmallow 64 bit Tester"
       swarming_host: "chromium-swarm.appspot.com"
@@ -4610,68 +4672,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "android-pie-arm64-coverage-experimental-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      properties: "{\"$build/chromium_tests\":{\"project_trigger_overrides\":{\"chromium\":\"chromium-m91\"}},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"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\":\"chromium.android\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium.resultdb.result_sink"
-        value: 100
-      }
-      experiments {
-        key: "chromium.resultdb.result_sink.gtests_local"
-        value: 100
-      }
-      experiments {
-        key: "chromium.resultdb.result_sink.junit_tests"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 10
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
     builders {
       name: "android-pie-arm64-dbg"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6521,71 +6521,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "android-pie-arm64-coverage-experimental-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:16"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      properties: "{\"$build/code_coverage\":{\"use_clang_coverage\":true},\"$build/goma\":{\"enable_ats\":true,\"jobs\":300,\"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.android\",\"recipe\":\"chromium_trybot\"}"
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      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: "chromium.resultdb.result_sink.junit_tests"
-        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/.+"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
     builders {
       name: "android-pie-arm64-dbg"
       swarming_host: "chromium-swarm.appspot.com"

diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
@@ -110,6 +110,11 @@ consoles {
     category: "chromium.mac|ios|default"
     short_name: "ful"
   }
+  builders {
+    name: "buildbucket/luci.chromium-m91.ci/Mac11 Tests"
+    category: "chromium.mac|mac"
+    short_name: "11"
+  }
   builders {
     name: "buildbucket/luci.chromium-m91.ci/Linux Builder"
     category: "chromium.linux|release"
@@ -988,9 +993,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium-m91.try/android-marshmallow-arm64-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-coverage-experimental-rel"
-  }
   builders {
     name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-dbg"
   }
@@ -1283,11 +1285,6 @@ consoles {
     category: "builder_tester|arm64"
     short_name: "N"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m91.ci/android-pie-arm64-coverage-experimental-rel"
-    category: "builder_tester|arm64"
-    short_name: "p-cov"
-  }
   builders {
     name: "buildbucket/luci.chromium-m91.ci/android-marshmallow-x86-rel"
     category: "builder_tester|x86"
@@ -1775,6 +1772,11 @@ consoles {
     category: "ios|default"
     short_name: "ful"
   }
+  builders {
+    name: "buildbucket/luci.chromium-m91.ci/Mac11 Tests"
+    category: "mac"
+    short_name: "11"
+  }
   header {
     oncalls {
       name: "Chromium Branches"
@@ -1924,9 +1926,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium-m91.try/android-official"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-coverage-experimental-rel"
-  }
   builders {
     name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-dbg"
   }
@@ -2146,9 +2145,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium-m91.try/android-marshmallow-x86-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-coverage-experimental-rel"
-  }
   builders {
     name: "buildbucket/luci.chromium-m91.try/android-pie-arm64-dbg"
   }

diff --git a/infra/config/generated/luci-notify.cfg b/infra/config/generated/luci-notify.cfg
@@ -523,6 +523,18 @@ notifiers {
     name: "Mac10.15 Tests (dbg)"
   }
 }
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+  }
+  notifications {
+    on_new_status: INFRA_FAILURE
+  }
+  builders {
+    bucket: "ci"
+    name: "Mac11 Tests"
+  }
+}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE

diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
@@ -672,6 +672,20 @@ job {
     builder: "Mac10.15 Tests (dbg)"
   }
 }
+job {
+  id: "Mac11 Tests"
+  realm: "ci"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium-m91.ci"
+    builder: "Mac11 Tests"
+  }
+}
 job {
   id: "Marshmallow 64 bit Tester"
   realm: "ci"
@@ -908,16 +922,6 @@ job {
     builder: "android-official"
   }
 }
-job {
-  id: "android-pie-arm64-coverage-experimental-rel"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium-m91.ci"
-    builder: "android-pie-arm64-coverage-experimental-rel"
-  }
-}
 job {
   id: "android-pie-arm64-dbg"
   realm: "ci"
@@ -1273,7 +1277,6 @@ trigger {
   triggers: "android-marshmallow-x86-rel"
   triggers: "android-nougat-arm64-rel"
   triggers: "android-official"
-  triggers: "android-pie-arm64-coverage-experimental-rel"
   triggers: "android-pie-arm64-rel"
   triggers: "chromeos-amd64-generic-dbg"
   triggers: "chromeos-amd64-generic-lacros-dbg"

diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
@@ -909,7 +909,6 @@ ci.android_builder(
 # running on CQ.
 ci.android_builder(
     name = "android-pie-arm64-coverage-experimental-rel",
-    branch_selector = branches.STANDARD_MILESTONE,
     console_view_entry = consoles.console_view_entry(
         category = "builder_tester|arm64",
         short_name = "p-cov",
@@ -5310,6 +5309,7 @@ ci.thin_tester(
 
 ci.thin_tester(
     name = "Mac11 Tests",
+    branch_selector = branches.STANDARD_MILESTONE,
     builder_group = "chromium.mac",
     console_view_entry = consoles.console_view_entry(
         category = "mac",

diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star
@@ -448,7 +448,6 @@ try_.chromium_android_builder(
 # TODO(crbug/1182468) Remove when experiment is done.
 try_.chromium_android_builder(
     name = "android-pie-arm64-coverage-experimental-rel",
-    branch_selector = branches.STANDARD_MILESTONE,
     builderless = True,
     cores = 16,
     goma_jobs = goma.jobs.J300,