End M2 experiment

Ends the GPU/Dawn M2 Mac 14.4.1 experiment and locks the stable version to 14.4.1. The experimental builders have already been paused. Fixed: 327017901 Change-Id: Ia052cbdd7d05ba0fc3535c7011c319b14454cdad Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5640428 Auto-Submit: Brian Sheedy <bsheedy@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Cr-Commit-Position: refs/heads/main@{#1317060}
Phantom77177 · Jun 19, 2024 · d45eec8 · d45eec8
1 parent c358f4d
commit d45eec8
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 1,983 deletions.
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
@@ -7967,11 +7967,6 @@ consoles {
     category: "ToT|Mac"
     short_name: "arm64"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Dawn Mac arm64 Experimental Release (Apple M2)"
-    category: "ToT|Mac"
-    short_name: "exp"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Dawn Mac arm64 Builder"
     category: "ToT|Mac|Builder"
@@ -10663,11 +10658,6 @@ consoles {
     category: "Mac|AMD|Retina"
     short_name: "asn"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Retina Release (Apple M2)"
-    category: "Mac|Apple"
-    short_name: "exp"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Mac FYI Release (Apple M1)"
     category: "Mac|Apple"

diff --git a/infra/config/generated/testing/mixins.pyl b/infra/config/generated/testing/mixins.pyl
@@ -932,7 +932,7 @@
         'cpu': 'arm64',
         'gpu': 'apple:m2',
         'mac_model': 'Mac14,7',
-        'os': 'Mac-13.3.1|Mac-14.4.1',
+        'os': 'Mac-14.4.1',
         'pool': 'chromium.tests.gpu',
         'display_attached': '1',
         'hidpi': '1',

diff --git a/infra/config/subprojects/chromium/ci/chromium.dawn.star b/infra/config/subprojects/chromium/ci/chromium.dawn.star
@@ -876,10 +876,10 @@ ci.thin_tester(
         run_tests_serially = True,
     ),
     # Uncomment this entry when this experimental tester is actually in use.
-    console_view_entry = consoles.console_view_entry(
-        category = "ToT|Mac",
-        short_name = "exp",
-    ),
+    # console_view_entry = consoles.console_view_entry(
+    #     category = "ToT|Mac",
+    #     short_name = "exp",
+    # ),
     list_view = "chromium.gpu.experimental",
 )
 

diff --git a/infra/config/subprojects/chromium/ci/chromium.gpu.fyi.star b/infra/config/subprojects/chromium/ci/chromium.gpu.fyi.star
@@ -1170,10 +1170,10 @@ ci.thin_tester(
         run_tests_serially = True,
     ),
     # Uncomment this entry when this experimental tester is actually in use.
-    console_view_entry = consoles.console_view_entry(
-        category = "Mac|Apple",
-        short_name = "exp",
-    ),
+    # console_view_entry = consoles.console_view_entry(
+    #     category = "Mac|Apple",
+    #     short_name = "exp",
+    # ),
     list_view = "chromium.gpu.experimental",
 )
 

diff --git a/infra/config/targets/mixins.star b/infra/config/targets/mixins.star
@@ -1201,7 +1201,7 @@ targets.mixin(
             "cpu": "arm64",
             "gpu": "apple:m2",
             "mac_model": "Mac14,7",
-            "os": "Mac-13.3.1|Mac-14.4.1",
+            "os": "Mac-14.4.1",
             "pool": "chromium.tests.gpu",
             "display_attached": "1",
             "hidpi": "1",