Remove decommisioned Pixel2 perf bots

Bug: None Change-Id: I872fe20b9ce901e8a5dd2dd814f00bb7d368e1ec Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/313542 Reviewed-by: Björn Terelius <[email protected]> Commit-Queue: Christoffer Jansson <[email protected]> Cr-Commit-Position: refs/heads/main@{#40486}
basharalbashier · Jul 28, 2023 · c787adc · c787adc
1 parent 4f4e989
commit c787adc
Show file tree

Hide file tree

Showing 15 changed files with 158 additions and 505 deletions.
diff --git a/infra/config/config.star b/infra/config/config.star
@@ -693,14 +693,12 @@ ci_builder("Android32", "Android|arm|rel")
 try_builder("android_arm_rel")
 ci_builder("Android32 Builder arm", "Android|arm|size", perf_cat = "Android|arm|Builder|", prioritized = True)
 try_builder("android_compile_arm_rel")
-perf_builder("Perf Android32 (O Pixel2)", "Android|arm|Tester|O Pixel2", triggered_by = ["Android32 Builder arm"])
 perf_builder("Perf Android32 (R Pixel5)", "Android|arm|Tester|R Pixel5", triggered_by = ["Android32 Builder arm"])
 try_builder("android_compile_arm64_dbg", cq = None)
 try_builder("android_arm64_dbg", cq = None)
 ci_builder("Android64", "Android|arm64|rel")
 try_builder("android_arm64_rel")
 ci_builder("Android64 Builder arm64", "Android|arm64|size", perf_cat = "Android|arm64|Builder|", prioritized = True)
-perf_builder("Perf Android64 (O Pixel2)", "Android|arm64|Tester|O Pixel2", triggered_by = ["Android64 Builder arm64"])
 perf_builder("Perf Android64 (R Pixel5)", "Android|arm64|Tester|R Pixel5", triggered_by = ["Android64 Builder arm64"])
 try_builder("android_compile_arm64_rel")
 ci_builder("Android64 Builder x64 (dbg)", "Android|x64|dbg")

diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
@@ -2278,52 +2278,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "Perf Android32 (O Pixel2)"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cores:8"
-      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/reclient": {'
-        '    "instance": "rbe-webrtc-trusted",'
-        '    "metrics_project": "chromium-reclient-metrics"'
-        '  },'
-        '  "$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: "[email protected]"
-      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 Android32 (R Pixel5)"
       swarming_host: "chromium-swarm.appspot.com"
@@ -2370,52 +2324,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "Perf Android64 (O Pixel2)"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cores:8"
-      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/reclient": {'
-        '    "instance": "rbe-webrtc-trusted",'
-        '    "metrics_project": "chromium-reclient-metrics"'
-        '  },'
-        '  "$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: "[email protected]"
-      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 Android64 (R Pixel5)"
       swarming_host: "chromium-swarm.appspot.com"

diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg
@@ -282,11 +282,6 @@ consoles {
     name: "buildbucket/luci.webrtc.perf/Android32 Builder arm"
     category: "Android|arm|Builder"
   }
-  builders {
-    name: "buildbucket/luci.webrtc.perf/Perf Android32 (O Pixel2)"
-    category: "Android|arm|Tester"
-    short_name: "O Pixel2"
-  }
   builders {
     name: "buildbucket/luci.webrtc.perf/Perf Android32 (R Pixel5)"
     category: "Android|arm|Tester"
@@ -296,11 +291,6 @@ consoles {
     name: "buildbucket/luci.webrtc.perf/Android64 Builder arm64"
     category: "Android|arm64|Builder"
   }
-  builders {
-    name: "buildbucket/luci.webrtc.perf/Perf Android64 (O Pixel2)"
-    category: "Android|arm64|Tester"
-    short_name: "O Pixel2"
-  }
   builders {
     name: "buildbucket/luci.webrtc.perf/Perf Android64 (R Pixel5)"
     category: "Android|arm64|Tester"

diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg
@@ -1207,28 +1207,6 @@ notifiers {
     failed_step_regexp_exclude: ".*\\(experimental\\).*"
   }
 }
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-    email {
-      recipients: "[email protected]"
-    }
-    template: "infra_failure"
-  }
-  notifications {
-    on_new_status: FAILURE
-    email {
-      recipients: "[email protected]"
-    }
-    template: "build_failure"
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "perf"
-    name: "Perf Android32 (O Pixel2)"
-    repository: "https://webrtc.googlesource.com/src"
-  }
-}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
@@ -1251,28 +1229,6 @@ notifiers {
     repository: "https://webrtc.googlesource.com/src"
   }
 }
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-    email {
-      recipients: "[email protected]"
-    }
-    template: "infra_failure"
-  }
-  notifications {
-    on_new_status: FAILURE
-    email {
-      recipients: "[email protected]"
-    }
-    template: "build_failure"
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "perf"
-    name: "Perf Android64 (O Pixel2)"
-    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
@@ -365,24 +365,6 @@ job {
     builder: "MacArm64 Builder"
   }
 }
-job {
-  id: "Perf Android32 (O Pixel2)"
-  realm: "perf"
-  acls {
-    role: TRIGGERER
-    granted_to: "[email protected]"
-  }
-  acl_sets: "perf"
-  triggering_policy {
-    kind: LOGARITHMIC_BATCHING
-    log_base: 1.7
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "perf"
-    builder: "Perf Android32 (O Pixel2)"
-  }
-}
 job {
   id: "Perf Android32 (R Pixel5)"
   realm: "perf"
@@ -401,24 +383,6 @@ job {
     builder: "Perf Android32 (R Pixel5)"
   }
 }
-job {
-  id: "Perf Android64 (O Pixel2)"
-  realm: "perf"
-  acls {
-    role: TRIGGERER
-    granted_to: "[email protected]"
-  }
-  acl_sets: "perf"
-  triggering_policy {
-    kind: LOGARITHMIC_BATCHING
-    log_base: 1.7
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "perf"
-    builder: "Perf Android64 (O Pixel2)"
-  }
-}
 job {
   id: "Perf Android64 (R Pixel5)"
   realm: "perf"

diff --git a/infra/config/project.cfg b/infra/config/project.cfg
@@ -7,7 +7,7 @@
 name: "webrtc"
 access: "group:all"
 lucicfg {
-  version: "1.39.4"
+  version: "1.39.10"
   package_dir: "."
   config_dir: "."
   entry_point: "config.star"

diff --git a/infra/config/realms.cfg b/infra/config/realms.cfg
@@ -111,9 +111,7 @@ realms {
     conditions {
       restrict {
         attribute: "scheduler.job.name"
-        values: "Perf Android32 (O Pixel2)"
         values: "Perf Android32 (R Pixel5)"
-        values: "Perf Android64 (O Pixel2)"
         values: "Perf Android64 (R Pixel5)"
         values: "Perf Fuchsia"
         values: "Perf Linux Bionic"