From 68dcea5f0d5e7fe596050ca1c291ee4e4c82ef18 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Tue, 26 Apr 2022 09:55:47 +0200 Subject: [PATCH] Remove the bot 'Perf Linux Trusty' Bug: chromium:1199405 Change-Id: I0a0ca56b217760cba0db6b1a8b1580bea0edc6a5 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/260103 Reviewed-by: Mirko Bonadei Reviewed-by: Christoffer Jansson Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#36652} --- infra/config/config.star | 1 - infra/config/cr-buildbucket.cfg | 48 ------------------- infra/config/luci-milo.cfg | 5 -- infra/config/luci-notify.cfg | 22 --------- infra/config/luci-scheduler.cfg | 18 -------- infra/config/realms.cfg | 1 - infra/specs/client.webrtc.perf.json | 71 ----------------------------- infra/specs/mixins.pyl | 7 --- infra/specs/waterfalls.pyl | 12 ----- 9 files changed, 185 deletions(-) diff --git a/infra/config/config.star b/infra/config/config.star index 3540c2b414..efdc80cdd4 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -732,7 +732,6 @@ linux_builder("Linux64 Release", "Linux|x64|rel") linux_try_job("linux_rel") linux_builder("Linux64 Builder", "Linux|x64|size", perf_cat = "Linux|x64|Builder|", prioritized = True) linux_try_job("linux_compile_rel") -perf_builder("Perf Linux Trusty", "Linux|x64|Tester|Trusty", triggered_by = ["Linux64 Builder"]) perf_builder("Perf Linux Bionic", "Linux|x64|Tester|Bionic", triggered_by = ["Linux64 Builder"]) linux_builder("Linux32 Debug (ARM)", "Linux|arm|dbg") linux_try_job("linux_compile_arm_dbg") diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg index fbac719dcc..f1b016b6d8 100644 --- a/infra/config/cr-buildbucket.cfg +++ b/infra/config/cr-buildbucket.cfg @@ -2591,54 +2591,6 @@ buckets { } } } - builders { - name: "Perf Linux Trusty" - swarming_host: "chromium-swarm.appspot.com" - swarming_tags: "vpython:native-python-wrapper" - dimensions: "os:Linux" - dimensions: "pool:luci.webrtc.perf" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/goma": {' - ' "server_host": "goma.chromium.org",' - ' "use_luci_auth": true' - ' },' - ' "$recipe_engine/isolated": {' - ' "server": "https://isolateserver.appspot.com"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "client.webrtc.perf",' - ' "recipe": "webrtc/standalone"' - '}' - priority: 30 - execution_timeout_secs: 10800 - build_numbers: YES - service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "webrtc-ci" - dataset: "resultdb" - table: "perf_test_results" - test_results {} - } - } - } builders { name: "Perf Mac 10.11" swarming_host: "chromium-swarm.appspot.com" diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg index cb9491ebe6..4a0e2f78e1 100644 --- a/infra/config/luci-milo.cfg +++ b/infra/config/luci-milo.cfg @@ -317,11 +317,6 @@ consoles { name: "buildbucket/luci.webrtc.perf/Linux64 Builder" category: "Linux|x64|Builder" } - builders { - name: "buildbucket/luci.webrtc.perf/Perf Linux Trusty" - category: "Linux|x64|Tester" - short_name: "Trusty" - } builders { name: "buildbucket/luci.webrtc.perf/Perf Linux Bionic" category: "Linux|x64|Tester" diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg index c556153aa8..87a6e440fa 100644 --- a/infra/config/luci-notify.cfg +++ b/infra/config/luci-notify.cfg @@ -1290,28 +1290,6 @@ notifiers { repository: "https://webrtc.googlesource.com/src" } } -notifiers { - notifications { - on_new_status: INFRA_FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "infra_failure" - } - notifications { - on_new_status: FAILURE - email { - recipients: "webrtc-troopers-robots@google.com" - } - template: "build_failure" - notify_blamelist {} - } - builders { - bucket: "perf" - name: "Perf Linux Trusty" - repository: "https://webrtc.googlesource.com/src" - } -} notifiers { notifications { on_new_status: INFRA_FAILURE diff --git a/infra/config/luci-scheduler.cfg b/infra/config/luci-scheduler.cfg index 62fd5c3a10..87714e73c5 100644 --- a/infra/config/luci-scheduler.cfg +++ b/infra/config/luci-scheduler.cfg @@ -420,24 +420,6 @@ job { builder: "Perf Linux Bionic" } } -job { - id: "Perf Linux Trusty" - realm: "perf" - acls { - role: TRIGGERER - granted_to: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - } - acl_sets: "perf" - triggering_policy { - kind: LOGARITHMIC_BATCHING - log_base: 1.7 - } - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "perf" - builder: "Perf Linux Trusty" - } -} job { id: "Perf Mac 10.11" realm: "perf" diff --git a/infra/config/realms.cfg b/infra/config/realms.cfg index 36f32e4d2b..79a83ab6c2 100644 --- a/infra/config/realms.cfg +++ b/infra/config/realms.cfg @@ -104,7 +104,6 @@ realms { values: "Perf Android64 (M Nexus5X)" values: "Perf Android64 (O Pixel2)" values: "Perf Linux Bionic" - values: "Perf Linux Trusty" values: "Perf Mac 10.11" values: "Perf Win7" } diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json index 00c69af107..7603d179fd 100644 --- a/infra/specs/client.webrtc.perf.json +++ b/infra/specs/client.webrtc.perf.json @@ -374,77 +374,6 @@ } ] }, - "Perf Linux Trusty": { - "isolated_scripts": [ - { - "args": [ - ".", - "--remove", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" - ], - "isolate_name": "low_bandwidth_audio_perf_test", - "merge": { - "args": [ - "--test-suite", - "low_bandwidth_audio_perf_test" - ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" - }, - "name": "low_bandwidth_audio_perf_test", - "resultdb": { - "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", - "result_format": "gtest_json" - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "os": "Ubuntu-14.04", - "pool": "WebRTC-perf" - } - ], - "hard_timeout": 10800, - "idempotent": false, - "io_timeout": 10800 - }, - "test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/" - }, - { - "args": [ - "--test_artifacts_dir=${ISOLATED_OUTDIR}", - "--save_worst_frame", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json", - "--nologs" - ], - "isolate_name": "webrtc_perf_tests", - "merge": { - "args": [ - "--test-suite", - "webrtc_perf_tests" - ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" - }, - "name": "webrtc_perf_tests", - "resultdb": { - "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", - "result_format": "gtest_json" - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "os": "Ubuntu-14.04", - "pool": "WebRTC-perf" - } - ], - "hard_timeout": 10800, - "idempotent": false, - "io_timeout": 10800 - }, - "test_id_prefix": "ninja://:webrtc_perf_tests/" - } - ] - }, "Perf Mac 10.11": { "isolated_scripts": [ { diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index 282570e27f..12978c16b8 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -138,13 +138,6 @@ } } }, - 'linux-trusty': { - 'swarming': { - 'dimensions': { - 'os': 'Ubuntu-14.04' - } - } - }, 'logdog-butler': { 'swarming': { 'cipd_packages': [{ diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 385954e70e..92df72363f 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -280,18 +280,6 @@ 'isolated_scripts': 'desktop_perf_tests', }, }, - # TODO(tikuta): remove this (crbug.com/954875) - 'Perf Linux Trusty': { - 'os_type': - 'linux', - 'mixins': [ - 'linux-trusty', 'perf-pool', 'timeout-3h', - 'resultdb-gtest-json-format' - ], - 'test_suites': { - 'isolated_scripts': 'desktop_perf_tests', - }, - }, 'Perf Mac 10.11': { 'os_type': 'mac',