Skip to content

Commit

Permalink
Reland "Remove Mac 10.10 builders"
Browse files Browse the repository at this point in the history 
This reverts commit ce0f2cd.

Reason for revert: Landing after build side change

Original change's description:
> 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}

TBR=martiniss@chromium.org,gbeaty@chromium.org,guterman@google.com

# Not skipping CQ checks because this is a reland.

Bug: 1149560
Change-Id: Id8920e3b96033cbce6422ef2263c4fb96df7077d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2551641
Reviewed-by: 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@{#829838}
  • Loading branch information
@martiniss
martiniss authored and Commit Bot committed Nov 20, 2020
1 parent 2d3c7d1 commit 91d857a
Show file tree
Hide file tree
Showing 14 changed files with 0 additions and 2,060 deletions.
4 changes: 0 additions & 4 deletions infra/config/generated/commit-queue.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1358,10 +1358,6 @@ 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
Expand Down
148 changes: 0 additions & 148 deletions infra/config/generated/cr-buildbucket.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8864,53 +8864,6 @@ 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: 100
}
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"
Expand Down Expand Up @@ -19535,53 +19488,6 @@ 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: 100
}
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"
Expand Down Expand Up @@ -36942,60 +36848,6 @@ 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: 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: "mac_chromium_10.12_rel_ng"
swarming_host: "chromium-swarm.appspot.com"
Expand Down
26 changes: 0 additions & 26 deletions infra/config/generated/luci-milo.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,6 @@ 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"
Expand Down Expand Up @@ -824,11 +819,6 @@ 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"
Expand Down Expand Up @@ -7983,11 +7973,6 @@ 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"
Expand Down Expand Up @@ -9383,11 +9368,6 @@ 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"
Expand Down Expand Up @@ -12215,9 +12195,6 @@ 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"
}
Expand Down Expand Up @@ -13098,9 +13075,6 @@ 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"
}
Expand Down
18 changes: 0 additions & 18 deletions infra/config/generated/luci-notify.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1507,24 +1507,6 @@ 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
Expand Down
28 changes: 0 additions & 28 deletions infra/config/generated/luci-scheduler.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2602,20 +2602,6 @@ 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"
Expand Down Expand Up @@ -5864,20 +5850,6 @@ 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"
Expand Down
22 changes: 0 additions & 22 deletions infra/config/subprojects/chromium/ci.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2655,15 +2655,6 @@ 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(
Expand Down Expand Up @@ -4470,19 +4461,6 @@ 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,
Expand Down
4 changes: 0 additions & 4 deletions infra/config/subprojects/chromium/try.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1245,10 +1245,6 @@ 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",
)
Expand Down
Loading

0 comments on commit 91d857a

Please sign in to comment.