Luci: Add gcstress-cmc and allow running on Android B am: 15faea56c8

Original change: https://android-review.googlesource.com/c/platform/art/+/3468953

Change-Id: Ie687e58de3a0191a53059a6da8f120dacce24a8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6 files changed, 302 insertions, 48 deletions

diff --git a/tools/luci/config/generated/cr-buildbucket.cfg b/tools/luci/config/generated/cr-buildbucket.cfg
index 7ff98559f9..fd7bfdaf48 100644
--- a/tools/luci/config/generated/cr-buildbucket.cfg
+++ b/tools/luci/config/generated/cr-buildbucket.cfg
@@ -133,7 +133,7 @@ buckets {
       }
     }
     builders {
-      name: "host.x86.gsctress.32"
+      name: "host.x86.gcstress.32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "os:Ubuntu"
@@ -164,7 +164,7 @@ buckets {
       }
     }
     builders {
-      name: "host.x86.gsctress.64"
+      name: "host.x86.gcstress.64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "os:Ubuntu"
@@ -195,6 +195,66 @@ buckets {
       }
     }
     builders {
+      name: "host.x86.gcstress.cmc.32"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "os:Ubuntu"
+      dimensions: "pool:luci.art.ci"
+      recipe {
+        name: "art"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        properties_j: "bitness:32"
+        properties_j: "builder_group:\"client.art\""
+        properties_j: "debug:true"
+        properties_j: "gcstress:true"
+        properties_j: "generational_cc:true"
+        properties_j: "testrunner_args:[\"--verbose\",\"--host\",\"--debug\",\"--gcstress\"]"
+      }
+      execution_timeout_secs: 108000
+      expiration_secs: 61200
+      caches {
+        name: "art"
+        path: "art"
+      }
+      build_numbers: YES
+      service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "host.x86.gcstress.cmc.64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
+      dimensions: "os:Ubuntu"
+      dimensions: "pool:luci.art.ci"
+      recipe {
+        name: "art"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
+        properties_j: "builder_group:\"client.art\""
+        properties_j: "debug:true"
+        properties_j: "gcstress:true"
+        properties_j: "generational_cc:true"
+        properties_j: "testrunner_args:[\"--verbose\",\"--host\",\"--debug\",\"--gcstress\"]"
+      }
+      execution_timeout_secs: 108000
+      expiration_secs: 61200
+      caches {
+        name: "art"
+        path: "art"
+      }
+      build_numbers: YES
+      service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "host.x86.ndebug.32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
@@ -511,7 +571,7 @@ buckets {
     builders {
       name: "target.arm.cmc.32"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_os:A"
+      dimensions: "device_os:A|B"
       dimensions: "os:Android"
       dimensions: "pool:luci.art.ci"
       recipe {
@@ -542,7 +602,7 @@ buckets {
     builders {
       name: "target.arm.cmc.64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_os:A"
+      dimensions: "device_os:A|B"
       dimensions: "os:Android"
       dimensions: "pool:luci.art.ci"
       recipe {
@@ -571,7 +631,7 @@ buckets {
       }
     }
     builders {
-      name: "target.arm.gsctress.32"
+      name: "target.arm.gcstress.32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:S"
       dimensions: "os:Android"
@@ -584,7 +644,7 @@ buckets {
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:true"
-        properties_j: "device:\"target.arm.gsctress.32\""
+        properties_j: "device:\"target.arm.gcstress.32\""
         properties_j: "gcstress:true"
         properties_j: "generational_cc:true"
         properties_j: "product:\"arm_krait\""
@@ -604,7 +664,7 @@ buckets {
       }
     }
     builders {
-      name: "target.arm.gsctress.64"
+      name: "target.arm.gcstress.64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:S"
       dimensions: "os:Android"
@@ -617,7 +677,71 @@ buckets {
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:true"
-        properties_j: "device:\"target.arm.gsctress.64\""
+        properties_j: "device:\"target.arm.gcstress.64\""
+        properties_j: "gcstress:true"
+        properties_j: "generational_cc:true"
+        properties_j: "product:\"armv8\""
+        properties_j: "testrunner_args:[\"--target\",\"--verbose\",\"--debug\",\"--gcstress\"]"
+      }
+      execution_timeout_secs: 108000
+      expiration_secs: 61200
+      caches {
+        name: "art"
+        path: "art"
+      }
+      build_numbers: YES
+      service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "target.arm.gcstress.cmc.32"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_os:A|B"
+      dimensions: "os:Android"
+      dimensions: "pool:luci.art.ci"
+      recipe {
+        name: "art"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        properties_j: "bitness:32"
+        properties_j: "builder_group:\"client.art\""
+        properties_j: "debug:true"
+        properties_j: "device:\"target.arm.gcstress.cmc.32\""
+        properties_j: "gcstress:true"
+        properties_j: "generational_cc:true"
+        properties_j: "product:\"arm_krait\""
+        properties_j: "testrunner_args:[\"--target\",\"--verbose\",\"--debug\",\"--gcstress\"]"
+      }
+      execution_timeout_secs: 108000
+      expiration_secs: 61200
+      caches {
+        name: "art"
+        path: "art"
+      }
+      build_numbers: YES
+      service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "target.arm.gcstress.cmc.64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_os:A|B"
+      dimensions: "os:Android"
+      dimensions: "pool:luci.art.ci"
+      recipe {
+        name: "art"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
+        properties_j: "builder_group:\"client.art\""
+        properties_j: "debug:true"
+        properties_j: "device:\"target.arm.gcstress.cmc.64\""
         properties_j: "gcstress:true"
         properties_j: "generational_cc:true"
         properties_j: "product:\"armv8\""
diff --git a/tools/luci/config/generated/luci-milo.cfg b/tools/luci/config/generated/luci-milo.cfg
index 46d170e40f..92f3addf78 100644
--- a/tools/luci/config/generated/luci-milo.cfg
+++ b/tools/luci/config/generated/luci-milo.cfg
@@ -36,8 +36,13 @@ consoles {
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.art.ci/target.arm.gsctress.32"
-    category: "target.arm|gsctress"
+    name: "buildbucket/luci.art.ci/target.arm.gcstress.32"
+    category: "target.arm|gcstress"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.art.ci/target.arm.gcstress.cmc.32"
+    category: "target.arm|gcstress-cmc"
     short_name: "32"
   }
   builders {
@@ -56,8 +61,13 @@ consoles {
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.art.ci/target.arm.gsctress.64"
-    category: "target.arm|gsctress"
+    name: "buildbucket/luci.art.ci/target.arm.gcstress.64"
+    category: "target.arm|gcstress"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.art.ci/target.arm.gcstress.cmc.64"
+    category: "target.arm|gcstress-cmc"
     short_name: "64"
   }
   builders {
@@ -91,8 +101,13 @@ consoles {
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.art.ci/host.x86.gsctress.32"
-    category: "host.x86|gsctress"
+    name: "buildbucket/luci.art.ci/host.x86.gcstress.32"
+    category: "host.x86|gcstress"
+    short_name: "32"
+  }
+  builders {
+    name: "buildbucket/luci.art.ci/host.x86.gcstress.cmc.32"
+    category: "host.x86|gcstress-cmc"
     short_name: "32"
   }
   builders {
@@ -116,8 +131,13 @@ consoles {
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.art.ci/host.x86.gsctress.64"
-    category: "host.x86|gsctress"
+    name: "buildbucket/luci.art.ci/host.x86.gcstress.64"
+    category: "host.x86|gcstress"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.art.ci/host.x86.gcstress.cmc.64"
+    category: "host.x86|gcstress-cmc"
     short_name: "64"
   }
   builders {
diff --git a/tools/luci/config/generated/luci-notify.cfg b/tools/luci/config/generated/luci-notify.cfg
index e070750f3f..e21504573d 100644
--- a/tools/luci/config/generated/luci-notify.cfg
+++ b/tools/luci/config/generated/luci-notify.cfg
@@ -66,7 +66,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host.x86.gsctress.32"
+    name: "host.x86.gcstress.32"
   }
 }
 notifiers {
@@ -79,7 +79,33 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host.x86.gsctress.64"
+    name: "host.x86.gcstress.64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "art-team+chromium-buildbot@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "host.x86.gcstress.cmc.32"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "art-team+chromium-buildbot@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "host.x86.gcstress.cmc.64"
   }
 }
 notifiers {
@@ -248,7 +274,33 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "target.arm.gsctress.32"
+    name: "target.arm.gcstress.32"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "art-team+chromium-buildbot@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "target.arm.gcstress.64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "art-team+chromium-buildbot@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "target.arm.gcstress.cmc.32"
   }
 }
 notifiers {
@@ -261,7 +313,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "target.arm.gsctress.64"
+    name: "target.arm.gcstress.cmc.64"
   }
 }
 notifiers {
diff --git a/tools/luci/config/generated/luci-scheduler.cfg b/tools/luci/config/generated/luci-scheduler.cfg
index 4bdd3ebd38..4888f69517 100644
--- a/tools/luci/config/generated/luci-scheduler.cfg
+++ b/tools/luci/config/generated/luci-scheduler.cfg
@@ -45,23 +45,43 @@ job {
   }
 }
 job {
-  id: "host.x86.gsctress.32"
+  id: "host.x86.gcstress.32"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci"
-    builder: "host.x86.gsctress.32"
+    builder: "host.x86.gcstress.32"
   }
 }
 job {
-  id: "host.x86.gsctress.64"
+  id: "host.x86.gcstress.64"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci"
-    builder: "host.x86.gsctress.64"
+    builder: "host.x86.gcstress.64"
+  }
+}
+job {
+  id: "host.x86.gcstress.cmc.32"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "host.x86.gcstress.cmc.32"
+  }
+}
+job {
+  id: "host.x86.gcstress.cmc.64"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "host.x86.gcstress.cmc.64"
   }
 }
 job {
@@ -185,23 +205,43 @@ job {
   }
 }
 job {
-  id: "target.arm.gsctress.32"
+  id: "target.arm.gcstress.32"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "target.arm.gcstress.32"
+  }
+}
+job {
+  id: "target.arm.gcstress.64"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "target.arm.gcstress.64"
+  }
+}
+job {
+  id: "target.arm.gcstress.cmc.32"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci"
-    builder: "target.arm.gsctress.32"
+    builder: "target.arm.gcstress.cmc.32"
   }
 }
 job {
-  id: "target.arm.gsctress.64"
+  id: "target.arm.gcstress.cmc.64"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci"
-    builder: "target.arm.gsctress.64"
+    builder: "target.arm.gcstress.cmc.64"
   }
 }
 job {
@@ -252,8 +292,10 @@ trigger {
   triggers: "host.x86.64"
   triggers: "host.x86.cmc.32"
   triggers: "host.x86.cmc.64"
-  triggers: "host.x86.gsctress.32"
-  triggers: "host.x86.gsctress.64"
+  triggers: "host.x86.gcstress.32"
+  triggers: "host.x86.gcstress.64"
+  triggers: "host.x86.gcstress.cmc.32"
+  triggers: "host.x86.gcstress.cmc.64"
   triggers: "host.x86.ndebug.32"
   triggers: "host.x86.ndebug.64"
   triggers: "host.x86.ngen-cmc.32"
@@ -266,8 +308,10 @@ trigger {
   triggers: "target.arm.64"
   triggers: "target.arm.cmc.32"
   triggers: "target.arm.cmc.64"
-  triggers: "target.arm.gsctress.32"
-  triggers: "target.arm.gsctress.64"
+  triggers: "target.arm.gcstress.32"
+  triggers: "target.arm.gcstress.64"
+  triggers: "target.arm.gcstress.cmc.32"
+  triggers: "target.arm.gcstress.cmc.64"
   triggers: "target.arm.ndebug.32"
   triggers: "target.arm.ndebug.64"
   triggers: "target.arm.poison.32"
@@ -285,8 +329,10 @@ trigger {
   triggers: "host.x86.64"
   triggers: "host.x86.cmc.32"
   triggers: "host.x86.cmc.64"
-  triggers: "host.x86.gsctress.32"
-  triggers: "host.x86.gsctress.64"
+  triggers: "host.x86.gcstress.32"
+  triggers: "host.x86.gcstress.64"
+  triggers: "host.x86.gcstress.cmc.32"
+  triggers: "host.x86.gcstress.cmc.64"
   triggers: "host.x86.ndebug.32"
   triggers: "host.x86.ndebug.64"
   triggers: "host.x86.ngen-cmc.32"
@@ -299,8 +345,10 @@ trigger {
   triggers: "target.arm.64"
   triggers: "target.arm.cmc.32"
   triggers: "target.arm.cmc.64"
-  triggers: "target.arm.gsctress.32"
-  triggers: "target.arm.gsctress.64"
+  triggers: "target.arm.gcstress.32"
+  triggers: "target.arm.gcstress.64"
+  triggers: "target.arm.gcstress.cmc.32"
+  triggers: "target.arm.gcstress.cmc.64"
   triggers: "target.arm.ndebug.32"
   triggers: "target.arm.ndebug.64"
   triggers: "target.arm.poison.32"
@@ -318,8 +366,10 @@ trigger {
   triggers: "host.x86.64"
   triggers: "host.x86.cmc.32"
   triggers: "host.x86.cmc.64"
-  triggers: "host.x86.gsctress.32"
-  triggers: "host.x86.gsctress.64"
+  triggers: "host.x86.gcstress.32"
+  triggers: "host.x86.gcstress.64"
+  triggers: "host.x86.gcstress.cmc.32"
+  triggers: "host.x86.gcstress.cmc.64"
   triggers: "host.x86.ndebug.32"
   triggers: "host.x86.ndebug.64"
   triggers: "host.x86.ngen-cmc.32"
@@ -332,8 +382,10 @@ trigger {
   triggers: "target.arm.64"
   triggers: "target.arm.cmc.32"
   triggers: "target.arm.cmc.64"
-  triggers: "target.arm.gsctress.32"
-  triggers: "target.arm.gsctress.64"
+  triggers: "target.arm.gcstress.32"
+  triggers: "target.arm.gcstress.64"
+  triggers: "target.arm.gcstress.cmc.32"
+  triggers: "target.arm.gcstress.cmc.64"
   triggers: "target.arm.ndebug.32"
   triggers: "target.arm.ndebug.64"
   triggers: "target.arm.poison.32"
@@ -351,8 +403,10 @@ trigger {
   triggers: "host.x86.64"
   triggers: "host.x86.cmc.32"
   triggers: "host.x86.cmc.64"
-  triggers: "host.x86.gsctress.32"
-  triggers: "host.x86.gsctress.64"
+  triggers: "host.x86.gcstress.32"
+  triggers: "host.x86.gcstress.64"
+  triggers: "host.x86.gcstress.cmc.32"
+  triggers: "host.x86.gcstress.cmc.64"
   triggers: "host.x86.ndebug.32"
   triggers: "host.x86.ndebug.64"
   triggers: "host.x86.ngen-cmc.32"
@@ -365,8 +419,10 @@ trigger {
   triggers: "target.arm.64"
   triggers: "target.arm.cmc.32"
   triggers: "target.arm.cmc.64"
-  triggers: "target.arm.gsctress.32"
-  triggers: "target.arm.gsctress.64"
+  triggers: "target.arm.gcstress.32"
+  triggers: "target.arm.gcstress.64"
+  triggers: "target.arm.gcstress.cmc.32"
+  triggers: "target.arm.gcstress.cmc.64"
   triggers: "target.arm.ndebug.32"
   triggers: "target.arm.ndebug.64"
   triggers: "target.arm.poison.32"
diff --git a/tools/luci/config/generated/project.cfg b/tools/luci/config/generated/project.cfg
index 12b1ae6e69..3a46212fd6 100644
--- a/tools/luci/config/generated/project.cfg
+++ b/tools/luci/config/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "art"
 access: "group:all"
 lucicfg {
-  version: "1.43.14"
+  version: "1.43.16"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star
index a2e4e2afa1..2c530ba229 100755
--- a/tools/luci/config/main.star
+++ b/tools/luci/config/main.star
@@ -239,7 +239,7 @@ def add_builder(mode,
 
     # Create builder name based on the configuaration parameters.
     name = mode + '.' + arch
-    name += '.gsctress' if gcstress else ''
+    name += '.gcstress' if gcstress else ''
     name += '.poison' if poison else ''
     name += '.ngen' if ngen else ''
     name += '.cmc' if cmc else ''
@@ -253,6 +253,7 @@ def add_builder(mode,
     category = name.replace(".", "|")
     category = category.replace("host|", "host.")
     category = category.replace("target|", "target.")
+    category = category.replace("gcstress|cmc", "gcstress-cmc")
 
     product = None
     if arch == "arm":
@@ -263,13 +264,13 @@ def add_builder(mode,
     dimensions = {"os": "Android" if mode == "target" else "Ubuntu"}
     if mode == "target":
       if cmc:
-        # Request devices running Android 24Q3 (`AP1A` builds) for
+        # Request devices running at least Android 24Q3 (`AP1A` builds) for
         # (`userfaultfd`-based) Concurrent Mark-Compact GC configurations.
         # Currently (as of 2024-08-22), the only devices within the device pool
         # allocated to ART that are running `AP1A` builds are Pixel 6 devices
         # (all other device types are running older Android versions), which are
         # also the only device model supporting `userfaultfd` among that pool.
-        dimensions |= {"device_os": "A"}
+        dimensions |= {"device_os": "A|B"}
       else:
         # Run all other configurations on Android S since it is the oldest we support.
         # Other than the `AP1A` builds above, all other devices are flashed to `SP2A`.
@@ -321,6 +322,7 @@ def add_builders():
       add_builder(mode, arch, bitness, cmc=True)
       add_builder(mode, arch, bitness, poison=True)
       add_builder(mode, arch, bitness, gcstress=True)
+      add_builder(mode, arch, bitness, cmc=True, gcstress=True)
   add_builder('qemu', 'arm', bitness=64)
   add_builder('qemu', 'riscv', bitness=64)