Remove mac-upload-perfetto bot
The mac-arm64 platform is covered by Perfetto prebuilt binaries.
There's no need for an uploader bot anymore.
Bug: b/372174905
Change-Id: Ibb2b54c0911c4cfbc966782c031a4f1f73b3cbb9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5912857
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Mikhail Khokhlov <khokhlov@google.com>
Cr-Commit-Position: refs/heads/main@{#1365426}
diff --git a/infra/config/generated/builder-owners/~unowned.txt b/infra/config/generated/builder-owners/~unowned.txt
index 207bc4e..09f9eec4 100644
--- a/infra/config/generated/builder-owners/~unowned.txt
+++ b/infra/config/generated/builder-owners/~unowned.txt
@@ -108,7 +108,6 @@
ci/mac-updater-builder-asan-dbg
ci/mac-updater-builder-dbg
ci/mac-updater-builder-rel
-ci/mac-upload-perfetto
ci/mac11-arm64-updater-tester-dbg
ci/mac11-arm64-updater-tester-rel
ci/mac11-x64-updater-tester-dbg
diff --git a/infra/config/generated/builders/ci/mac-upload-perfetto/gn-args.json b/infra/config/generated/builders/ci/mac-upload-perfetto/gn-args.json
deleted file mode 100644
index 5ad23d49..0000000
--- a/infra/config/generated/builders/ci/mac-upload-perfetto/gn-args.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "gn_args": {
- "dcheck_always_on": false,
- "enable_perfetto_zlib": true,
- "is_component_build": false,
- "is_debug": false,
- "target_cpu": "arm64",
- "target_os": "mac",
- "use_remoteexec": true,
- "use_siso": true
- }
-}
\ No newline at end of file
diff --git a/infra/config/generated/builders/ci/mac-upload-perfetto/properties.json b/infra/config/generated/builders/ci/mac-upload-perfetto/properties.json
deleted file mode 100644
index 64a312d..0000000
--- a/infra/config/generated/builders/ci/mac-upload-perfetto/properties.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- "$build/chromium_tests_builder_config": {
- "builder_config": {
- "additional_exclusions": [
- "infra/config/generated/builders/ci/mac-upload-perfetto/gn-args.json"
- ],
- "builder_db": {
- "entries": [
- {
- "builder_id": {
- "bucket": "ci",
- "builder": "mac-upload-perfetto",
- "project": "chromium"
- },
- "builder_spec": {
- "build_gs_bucket": "chromium-fyi-archive",
- "builder_group": "chromium.fyi",
- "execution_mode": "COMPILE_AND_TEST",
- "legacy_chromium_config": {
- "apply_configs": [
- "mb"
- ],
- "build_config": "Release",
- "config": "chromium",
- "target_bits": 64,
- "target_platform": "mac"
- },
- "legacy_gclient_config": {
- "config": "chromium"
- }
- }
- }
- ]
- },
- "builder_ids": [
- {
- "bucket": "ci",
- "builder": "mac-upload-perfetto",
- "project": "chromium"
- }
- ]
- }
- },
- "$build/reclient": {
- "instance": "rbe-chromium-trusted",
- "metrics_project": "chromium-reclient-metrics",
- "scandeps_server": true
- },
- "$build/siso": {
- "configs": [
- "builder"
- ],
- "enable_cloud_profiler": true,
- "enable_cloud_trace": true,
- "experiments": [],
- "project": "rbe-chromium-trusted",
- "remote_jobs": 250
- },
- "$recipe_engine/resultdb/test_presentation": {
- "column_keys": [],
- "grouping_keys": [
- "status",
- "v.test_suite"
- ]
- },
- "builder_group": "chromium.fyi",
- "recipe": "chromium"
-}
\ No newline at end of file
diff --git a/infra/config/generated/builders/ci/mac-upload-perfetto/shadow-properties.json b/infra/config/generated/builders/ci/mac-upload-perfetto/shadow-properties.json
deleted file mode 100644
index 673c7c0..0000000
--- a/infra/config/generated/builders/ci/mac-upload-perfetto/shadow-properties.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "$build/reclient": {
- "instance": "rbe-chromium-untrusted",
- "metrics_project": "chromium-reclient-metrics",
- "scandeps_server": true
- },
- "$build/siso": {
- "configs": [
- "builder"
- ],
- "enable_cloud_profiler": true,
- "enable_cloud_trace": true,
- "experiments": [],
- "project": "rbe-chromium-untrusted",
- "remote_jobs": 250
- }
-}
\ No newline at end of file
diff --git a/infra/config/generated/builders/gn_args_locations.json b/infra/config/generated/builders/gn_args_locations.json
index cebf729..0e1cb076 100644
--- a/infra/config/generated/builders/gn_args_locations.json
+++ b/infra/config/generated/builders/gn_args_locations.json
@@ -333,7 +333,6 @@
"linux-wpt-chromium-rel": "ci/linux-wpt-chromium-rel/gn-args.json",
"mac-osxbeta-rel": "ci/mac-osxbeta-rel/gn-args.json",
"mac-perfetto-rel": "ci/mac-perfetto-rel/gn-args.json",
- "mac-upload-perfetto": "ci/mac-upload-perfetto/gn-args.json",
"mac13-wpt-chromium-rel": "ci/mac13-wpt-chromium-rel/gn-args.json",
"win-annotator-rel": "ci/win-annotator-rel/gn-args.json",
"win-fieldtrial-rel": "ci/win-fieldtrial-rel/gn-args.json",
diff --git a/infra/config/generated/health-specs/health-specs.json b/infra/config/generated/health-specs/health-specs.json
index 8eaf88e..d2ba068 100644
--- a/infra/config/generated/health-specs/health-specs.json
+++ b/infra/config/generated/health-specs/health-specs.json
@@ -11463,26 +11463,6 @@
}
]
},
- "mac-upload-perfetto": {
- "problem_specs": [
- {
- "name": "Unhealthy",
- "period_days": 7,
- "score": 5,
- "thresholds": {
- "_default": "_default"
- }
- },
- {
- "name": "Low Value",
- "period_days": 90,
- "score": 1,
- "thresholds": {
- "_default": "_default"
- }
- }
- ]
- },
"mac11-arm64-enterprise-companion-tester-dbg": {
"contact_team_email": "omaha-client-dev@google.com",
"problem_specs": [
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 8212966..22a7048 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -54405,96 +54405,6 @@
}
}
builders {
- name: "mac-upload-perfetto"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "builderless:1"
- dimensions: "cpu:arm64"
- dimensions: "free_space:standard"
- dimensions: "os:Mac-14"
- dimensions: "pool:luci.chromium.ci"
- exe {
- cipd_package: "infra/chromium/bootstrapper/${platform}"
- cipd_version: "latest"
- cmd: "bootstrapper"
- }
- properties:
- '{'
- ' "$bootstrap/exe": {'
- ' "exe": {'
- ' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
- ' "cipd_version": "refs/heads/main",'
- ' "cmd": ['
- ' "luciexe"'
- ' ]'
- ' }'
- ' },'
- ' "$bootstrap/properties": {'
- ' "properties_file": "infra/config/generated/builders/ci/mac-upload-perfetto/properties.json",'
- ' "shadow_properties_file": "infra/config/generated/builders/ci/mac-upload-perfetto/shadow-properties.json",'
- ' "top_level_project": {'
- ' "ref": "refs/heads/main",'
- ' "repo": {'
- ' "host": "chromium.googlesource.com",'
- ' "project": "chromium/src"'
- ' }'
- ' }'
- ' },'
- ' "builder_group": "chromium.fyi",'
- ' "led_builder_is_bootstrapped": true,'
- ' "recipe": "chromium"'
- '}'
- priority: 35
- execution_timeout_secs: 36000
- build_numbers: YES
- service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "chromium_swarming.expose_merge_script_failures"
- value: 100
- }
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- resultdb {
- enable: true
- bq_exports {
- project: "chrome-luci-data"
- dataset: "chromium"
- table: "ci_test_results"
- test_results {}
- }
- bq_exports {
- project: "chrome-luci-data"
- dataset: "chromium"
- table: "gpu_ci_test_results"
- test_results {
- predicate {
- test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
- }
- }
- }
- bq_exports {
- project: "chrome-luci-data"
- dataset: "chromium"
- table: "blink_web_tests_ci_test_results"
- test_results {
- predicate {
- test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)"
- }
- }
- }
- history_options {
- use_invocation_timestamp: true
- }
- }
- shadow_builder_adjustments {
- service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
- pool: "luci.chromium.try"
- dimensions: "free_space:"
- dimensions: "pool:luci.chromium.try"
- }
- }
- builders {
name: "mac11-arm64-enterprise-companion-tester-dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index d8427954..722dcd52 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -10194,11 +10194,6 @@
short_name: "lnx"
}
builders {
- name: "buildbucket/luci.chromium.ci/mac-upload-perfetto"
- category: "perfetto"
- short_name: "mac"
- }
- builders {
name: "buildbucket/luci.chromium.ci/win-upload-perfetto"
category: "perfetto"
short_name: "win"
diff --git a/infra/config/generated/luci/luci-notify.cfg b/infra/config/generated/luci/luci-notify.cfg
index 32dc2af..6470954 100644
--- a/infra/config/generated/luci/luci-notify.cfg
+++ b/infra/config/generated/luci/luci-notify.cfg
@@ -3596,18 +3596,6 @@
}
notifiers {
notifications {
- on_new_status: FAILURE
- email {
- recipients: "chrometto-sheriff-oncall@google.com"
- }
- }
- builders {
- bucket: "ci"
- name: "mac-upload-perfetto"
- }
-}
-notifiers {
- notifications {
on_occurrence: FAILURE
failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|generate_build_files|runhooks|update|\\w*nocompile_test)\\b"
email {
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
index 68499125..f99ec2a 100644
--- a/infra/config/generated/luci/luci-scheduler.cfg
+++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -5714,16 +5714,6 @@
}
}
job {
- id: "mac-upload-perfetto"
- realm: "ci"
- schedule: "with 3h interval"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "mac-upload-perfetto"
- }
-}
-job {
id: "mac11-arm64-enterprise-companion-tester-dbg"
realm: "ci"
buildbucket {
diff --git a/infra/config/lib/builder_exemptions.star b/infra/config/lib/builder_exemptions.star
index 9e190019..49ddb4a 100644
--- a/infra/config/lib/builder_exemptions.star
+++ b/infra/config/lib/builder_exemptions.star
@@ -448,7 +448,6 @@
"mac-updater-builder-asan-dbg",
"mac-updater-builder-dbg",
"mac-updater-builder-rel",
- "mac-upload-perfetto",
"mac11-arm64-rel-tests",
"mac11-arm64-updater-tester-dbg",
"mac11-arm64-updater-tester-rel",
@@ -1094,7 +1093,6 @@
"mac-updater-builder-asan-dbg",
"mac-updater-builder-dbg",
"mac-updater-builder-rel",
- "mac-upload-perfetto",
"mac11-arm64-updater-tester-dbg",
"mac11-arm64-updater-tester-rel",
"mac11-x64-updater-tester-dbg",
diff --git a/infra/config/subprojects/chromium/ci/chromium.fyi.star b/infra/config/subprojects/chromium/ci/chromium.fyi.star
index 5618abd..c078f03 100644
--- a/infra/config/subprojects/chromium/ci/chromium.fyi.star
+++ b/infra/config/subprojects/chromium/ci/chromium.fyi.star
@@ -941,40 +941,6 @@
notifies = ["chrometto-sheriff"],
)
-fyi_mac_builder(
- name = "mac-upload-perfetto",
- schedule = "with 3h interval",
- triggered_by = [],
- builder_spec = builder_config.builder_spec(
- gclient_config = builder_config.gclient_config(config = "chromium"),
- chromium_config = builder_config.chromium_config(
- config = "chromium",
- apply_configs = ["mb"],
- build_config = builder_config.build_config.RELEASE,
- target_bits = 64,
- target_platform = builder_config.target_platform.MAC,
- ),
- build_gs_bucket = "chromium-fyi-archive",
- ),
- gn_args = gn_args.config(
- configs = [
- "release_builder",
- "remoteexec",
- "perfetto_zlib",
- "mac",
- "arm64",
- ],
- ),
- builderless = True,
- cores = None,
- cpu = cpu.ARM64,
- console_view_entry = consoles.console_view_entry(
- category = "perfetto",
- short_name = "mac",
- ),
- notifies = ["chrometto-sheriff"],
-)
-
ci.builder(
name = "win-upload-perfetto",
schedule = "with 3h interval",
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index c181bbe..3a9c94db 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -44228,18 +44228,6 @@
}
]
},
- "mac-upload-perfetto": {
- "additional_compile_targets": [
- "trace_processor_shell"
- ],
- "isolated_scripts": [
- {
- "name": "upload_trace_processor",
- "test": "upload_trace_processor",
- "test_id_prefix": "ninja://tools/perf/core/perfetto_binary_roller:upload_trace_processor/"
- }
- ]
- },
"mac13-wpt-chromium-rel": {
"isolated_scripts": [
{
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index e38b0a9..aa8c0cb 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -2825,13 +2825,6 @@
'gtest_tests': 'perfetto_gtests',
},
},
- 'mac-upload-perfetto': {
- 'additional_compile_targets': [ 'trace_processor_shell' ],
- 'test_suites': {
- 'isolated_scripts': 'upload_perfetto',
- },
- 'use_swarming': False,
- },
'mac13-wpt-chromium-rel': {
'mixins': [
'has_native_resultdb_integration',
