Delete "Mac FYI GPU ASAN Release" and trybot

To replace it with a split builder/tester bot with serialized tests. To reduce the load on Mac Retina AMD pool. Bug: 1255237 Change-Id: Ia28212aa8f42541d691f4969c5bfe3b41d441adb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3200452 Reviewed-by: Brian Sheedy <bsheedy@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Cr-Commit-Position: refs/heads/main@{#927446}
marcosholgado · Oct 1, 2021 · 6d788be · 6d788be
1 parent fbe6fff
commit 6d788be
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 1,968 deletions.
diff --git a/docs/gpu/gpu_testing_bot_details.md b/docs/gpu/gpu_testing_bot_details.md
@@ -54,7 +54,6 @@ queries of the bots and see, for example, which GPUs are available.
 
 The waterfall bots run tests on a single GPU type in order to make it easier to
 see regressions or flakiness that affect only a certain type of GPU.
-'Mac FYI GPU ASAN Release' is an exception, running both on Intel and AMD GPUs.
 
 The tryservers like `win10_chromium_x64_rel_ng` which include GPU tests, on the other
 hand, run tests on more than one GPU type. As of this writing, the Windows

diff --git a/infra/config/generated/builders/ci/Mac FYI GPU ASAN Release/properties.textpb b/infra/config/generated/builders/ci/Mac FYI GPU ASAN Release/properties.textpb
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-asan/properties.textpb b/infra/config/generated/builders/try/gpu-fyi-try-mac-asan/properties.textpb
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg
@@ -891,10 +891,6 @@ config_groups {
         name: "chromium/try/gpu-fyi-try-mac-arm64-apple-m1-rel"
         includable_only: true
       }
-      builders {
-        name: "chromium/try/gpu-fyi-try-mac-asan"
-        includable_only: true
-      }
       builders {
         name: "chromium/try/gpu-fyi-try-mac-intel-dbg"
         includable_only: true

diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -15492,92 +15492,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "Mac FYI GPU ASAN Release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builder:Mac FYI GPU ASAN Release"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$kitchen": {'
-        '    "devshell": true,'
-        '    "git_auth": true'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "chromium.gpu.fyi",'
-        '  "perf_dashboard_machine_group": "ChromiumGPUFYI",'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chromium.gpu"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 21600
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium.chromium_tests.use_gitiles_trigger"
-        value: 100
-      }
-      experiments {
-        key: "chromium.chromium_tests.use_rdb_results"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        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/test:|content/test:fuchsia_)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/.+"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
     builders {
       name: "Mac FYI Release (Apple M1)"
       swarming_host: "chromium-swarm.appspot.com"
@@ -63042,92 +62956,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "gpu-fyi-try-mac-asan"
-      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.gpu.mac.retina.amd.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$kitchen": {'
-        '    "devshell": true,'
-        '    "git_auth": true'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "tryserver.chromium.mac",'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 21600
-      expiration_secs: 7200
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.chromium_tests.use_rdb_results"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
     builders {
       name: "gpu-fyi-try-mac-intel-dbg"
       swarming_host: "chromium-swarm.appspot.com"

diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
@@ -8181,11 +8181,6 @@ consoles {
     category: "Windows|7|x86|Nvidia"
     short_name: "rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Mac FYI GPU ASAN Release"
-    category: "Mac"
-    short_name: "asn"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/GPU FYI Mac Builder"
     category: "Mac|Builder"
@@ -14432,9 +14427,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-arm64-apple-m1-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-asan"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-intel-dbg"
   }
@@ -15819,9 +15811,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-arm64-apple-m1-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-asan"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-intel-dbg"
   }

diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
@@ -2418,16 +2418,6 @@ job {
     builder: "Mac FYI Experimental Retina Release (NVIDIA)"
   }
 }
-job {
-  id: "Mac FYI GPU ASAN Release"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Mac FYI GPU ASAN Release"
-  }
-}
 job {
   id: "Mac FYI Release (Apple M1)"
   realm: "ci"
@@ -7362,7 +7352,6 @@ trigger {
   triggers: "Mac Builder (dbg)"
   triggers: "Mac Builder (reclient)"
   triggers: "Mac Builder Next"
-  triggers: "Mac FYI GPU ASAN Release"
   triggers: "Mac deterministic"
   triggers: "Mac deterministic (dbg)"
   triggers: "Mojo Android"

diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
@@ -4982,14 +4982,6 @@ ci.gpu_fyi_linux_builder(
     ),
 )
 
-ci.gpu_fyi_mac_builder(
-    name = "Mac FYI GPU ASAN Release",
-    console_view_entry = consoles.console_view_entry(
-        category = "Mac",
-        short_name = "asn",
-    ),
-)
-
 ci.gpu_fyi_mac_builder(
     name = "GPU FYI Mac Builder",
     console_view_entry = consoles.console_view_entry(

diff --git a/infra/config/subprojects/chromium/gpu.try.star b/infra/config/subprojects/chromium/gpu.try.star
@@ -258,13 +258,6 @@ gpu_mac_builder(
     pool = "luci.chromium.gpu.mac.arm64.apple.m1.try",
 )
 
-gpu_mac_builder(
-    name = "gpu-fyi-try-mac-asan",
-    # This bot actually uses both Mac Retina AMD and Mac Mini Intel resources.
-    # Group it in Mac Retina AMD users pool, since it is smaller.
-    pool = "luci.chromium.gpu.mac.retina.amd.try",
-)
-
 gpu_mac_builder(
     name = "gpu-fyi-try-mac-intel-dbg",
     pool = "luci.chromium.gpu.mac.mini.intel.try",