Revert "Remove Mac 10.10 builders"

This reverts commit f983ad8. Reason for revert: Broke CI builder mac-updater-builder-rel https://ci.chromium.org/p/chromium/builders/ci/mac-updater-builder-rel/1198 Original change's description: > Remove Mac 10.10 builders > > Bug: 1149560 > Change-Id: Ib9798ca9e092edfba05dff7fa7f641e156182cb2 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2548680 > Auto-Submit: Stephen Martinis <martiniss@chromium.org> > Reviewed-by: Garrett Beaty <gbeaty@chromium.org> > Commit-Queue: Stephen Martinis <martiniss@chromium.org> > Cr-Commit-Position: refs/heads/master@{#829364} TBR=martiniss@chromium.org,gbeaty@chromium.org Change-Id: Ie979df929b64896c01ca4858909b8cbe902e7a25 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1149560 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2551638 Auto-Submit: Gregory Guterman <guterman@google.com> Reviewed-by: Garrett Beaty <gbeaty@chromium.org> Commit-Queue: Garrett Beaty <gbeaty@chromium.org> Cr-Commit-Position: refs/heads/master@{#829417}
marcosholgado · Nov 19, 2020 · ce0f2cd · ce0f2cd
1 parent 05a5021
commit ce0f2cd
Show file tree

Hide file tree

Showing 14 changed files with 2,060 additions and 0 deletions.
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg
@@ -1359,6 +1359,10 @@ config_groups {
         name: "chromium/try/mac11.0-blink-rel"
         includable_only: true
       }
+      builders {
+        name: "chromium/try/mac_chromium_10.10"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/mac_chromium_10.12_rel_ng"
         includable_only: true

diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
@@ -8864,6 +8864,53 @@ buckets {
         }
       }
     }
+    builders {
+      name: "Mac10.10 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/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: 80
+      }
+      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/.+"
+            }
+          }
+        }
+      }
+    }
     builders {
       name: "Mac10.11 Tests"
       swarming_host: "chromium-swarm.appspot.com"
@@ -19488,6 +19535,53 @@ buckets {
         }
       }
     }
+    builders {
+      name: "mac10.10-updater-tester-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/goma\":{\"enable_ats\":true,\"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.updater\",\"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: 80
+      }
+      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/.+"
+            }
+          }
+        }
+      }
+    }
     builders {
       name: "mac10.11-updater-tester-rel"
       swarming_host: "chromium-swarm.appspot.com"
@@ -36846,6 +36940,60 @@ buckets {
         }
       }
     }
+    builders {
+      name: "mac_chromium_10.10"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      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/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\"}"
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      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: 80
+      }
+      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: "mac_chromium_10.12_rel_ng"
       swarming_host: "chromium-swarm.appspot.com"

diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
@@ -145,6 +145,11 @@ consoles {
     category: "chromium.mac|release"
     short_name: "bld"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
+    category: "chromium.mac|release"
+    short_name: "10"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
     category: "chromium.mac|release"
@@ -819,6 +824,11 @@ consoles {
     category: "chromium.mac|release"
     short_name: "bld"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
+    category: "chromium.mac|release"
+    short_name: "10"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
     category: "chromium.mac|release"
@@ -7973,6 +7983,11 @@ consoles {
     category: "release"
     short_name: "bld"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
+    category: "release"
+    short_name: "10"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
     category: "release"
@@ -9368,6 +9383,11 @@ consoles {
     category: "debug|win"
     short_name: "bld"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac10.10-updater-tester-rel"
+    category: "release|mac"
+    short_name: "10.10"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/mac10.11-updater-tester-rel"
     category: "release|mac"
@@ -12195,6 +12215,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac11.0-blink-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.10"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.12_rel_ng"
   }
@@ -13075,6 +13098,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.10"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.12_rel_ng"
   }

diff --git a/infra/config/generated/luci-notify.cfg b/infra/config/generated/luci-notify.cfg
@@ -1507,6 +1507,24 @@ notifiers {
     failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
   }
 }
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    template: "tree_closure_email_template"
+  }
+  builders {
+    bucket: "ci"
+    name: "Mac10.10 Tests"
+  }
+  tree_closers {
+    tree_status_host: "chromium-status.appspot.com"
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+  }
+}
 notifiers {
   notifications {
     on_occurrence: FAILURE

diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
@@ -2602,6 +2602,20 @@ job {
     builder: "Mac deterministic (dbg)"
   }
 }
+job {
+  id: "Mac10.10 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.ci"
+    builder: "Mac10.10 Tests"
+  }
+}
 job {
   id: "Mac10.11 Tests"
   realm: "ci"
@@ -5850,6 +5864,20 @@ job {
     builder: "mac-upload-perfetto"
   }
 }
+job {
+  id: "mac10.10-updater-tester-rel"
+  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.ci"
+    builder: "mac10.10-updater-tester-rel"
+  }
+}
 job {
   id: "mac10.11-updater-tester-rel"
   realm: "ci"

diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
@@ -2655,6 +2655,15 @@ ci.updater_builder(
     cores = None,
 )
 
+ci.updater_builder(
+    name = "mac10.10-updater-tester-rel",
+    console_view_entry = ci.console_view_entry(
+        category = "release|mac",
+        short_name = "10.10",
+    ),
+    triggered_by = ["mac-updater-builder-rel"],
+)
+
 ci.updater_builder(
     name = "mac10.11-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
@@ -4463,6 +4472,19 @@ ci.thin_tester(
     triggered_by = [builder_name("mac-arm64-rel")],
 )
 
+ci.thin_tester(
+    name = "Mac10.10 Tests",
+    branch_selector = branches.STANDARD_MILESTONE,
+    builder_group = "chromium.mac",
+    console_view_entry = ci.console_view_entry(
+        category = "release",
+        short_name = "10",
+    ),
+    cq_mirrors_console_view = "mirrors",
+    main_console_view = "main",
+    triggered_by = [builder_name("Mac Builder")],
+)
+
 ci.thin_tester(
     name = "Mac10.11 Tests",
     branch_selector = branches.STANDARD_MILESTONE,

diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star
@@ -1245,6 +1245,10 @@ try_.chromium_mac_builder(
 # NOTE: the following trybots aren't sensitive to Mac version on which
 # they are built, hence no additional dimension is specified.
 # The 10.xx version translates to which bots will run isolated tests.
+try_.chromium_mac_builder(
+    name = "mac_chromium_10.10",
+)
+
 try_.chromium_mac_builder(
     name = "mac_chromium_10.12_rel_ng",
 )