diff options
| -rw-r--r-- | tools/luci/config/generated/cr-buildbucket.cfg | 310 | ||||
| -rw-r--r-- | tools/luci/config/generated/luci-scheduler.cfg | 140 | ||||
| -rwxr-xr-x | tools/luci/config/main.star | 39 |
3 files changed, 483 insertions, 6 deletions
diff --git a/tools/luci/config/generated/cr-buildbucket.cfg b/tools/luci/config/generated/cr-buildbucket.cfg index 51f38d8319..b9613a31be 100644 --- a/tools/luci/config/generated/cr-buildbucket.cfg +++ b/tools/luci/config/generated/cr-buildbucket.cfg @@ -584,6 +584,186 @@ buckets { } } builders { + name: "host.x86.debug.32" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cores:8" + dimensions: "os:Ubuntu-22" + 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: "concurrent_collector:true" + properties_j: "debug:true" + properties_j: "generational_cc:true" + properties_j: "testrunner_args:[\"--verbose\",\"--host\",\"--debug\"]" + } + 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.debug.64" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cores:8" + dimensions: "os:Ubuntu-22" + 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: "concurrent_collector:true" + properties_j: "debug:true" + properties_j: "generational_cc:true" + properties_j: "testrunner_args:[\"--verbose\",\"--host\",\"--debug\"]" + } + 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" + dimensions: "os:Ubuntu-22" + 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: "concurrent_collector:true" + properties_j: "generational_cc:true" + properties_j: "testrunner_args:[\"--verbose\",\"--host\",\"--ndebug\"]" + } + 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.64" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cores:8" + dimensions: "os:Ubuntu-22" + 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: "concurrent_collector:true" + properties_j: "generational_cc:true" + properties_j: "testrunner_args:[\"--verbose\",\"--host\",\"--ndebug\"]" + } + 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.poison.debug.32" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cores:8" + dimensions: "os:Ubuntu-22" + 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: "concurrent_collector:true" + properties_j: "debug:true" + properties_j: "generational_cc:true" + properties_j: "heap_poisoning:true" + properties_j: "testrunner_args:[\"--verbose\",\"--host\",\"--debug\"]" + } + 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.poison.debug.64" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cores:8" + dimensions: "os:Ubuntu-22" + 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: "concurrent_collector:true" + properties_j: "debug:true" + properties_j: "generational_cc:true" + properties_j: "heap_poisoning:true" + properties_j: "testrunner_args:[\"--verbose\",\"--host\",\"--debug\"]" + } + 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: "qemu-armv8-ndebug" swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:16" @@ -649,6 +829,136 @@ buckets { } } builders { + name: "target.arm.poison.debug.32" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "device_os:S" + 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: "concurrent_collector:true" + properties_j: "debug:true" + properties_j: "device:\"target.arm.poison.debug.32\"" + properties_j: "generational_cc:true" + properties_j: "heap_poisoning:true" + properties_j: "product:\"arm_krait\"" + properties_j: "testrunner_args:[\"--target\",\"--verbose\",\"--debug\"]" + } + 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.poison.debug.64" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "device_os:S" + 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: "concurrent_collector:true" + properties_j: "debug:true" + properties_j: "device:\"target.arm.poison.debug.64\"" + properties_j: "generational_cc:true" + properties_j: "heap_poisoning:true" + properties_j: "product:\"armv8\"" + properties_j: "testrunner_args:[\"--target\",\"--verbose\",\"--debug\"]" + } + 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.poison.ndebug.32" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "device_os:S" + 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: "concurrent_collector:true" + properties_j: "device:\"target.arm.poison.ndebug.32\"" + properties_j: "generational_cc:true" + properties_j: "heap_poisoning:true" + properties_j: "product:\"arm_krait\"" + properties_j: "testrunner_args:[\"--target\",\"--verbose\",\"--ndebug\"]" + } + 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.poison.ndebug.64" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "device_os:S" + 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: "concurrent_collector:true" + properties_j: "device:\"target.arm.poison.ndebug.64\"" + properties_j: "generational_cc:true" + properties_j: "heap_poisoning:true" + properties_j: "product:\"armv8\"" + properties_j: "testrunner_args:[\"--target\",\"--verbose\",\"--ndebug\"]" + } + 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: "walleye-armv7-poison-debug" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_os:S" diff --git a/tools/luci/config/generated/luci-scheduler.cfg b/tools/luci/config/generated/luci-scheduler.cfg index 87783ed779..7f4a6bab88 100644 --- a/tools/luci/config/generated/luci-scheduler.cfg +++ b/tools/luci/config/generated/luci-scheduler.cfg @@ -195,6 +195,66 @@ job { } } job { + id: "host.x86.debug.32" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "host.x86.debug.32" + } +} +job { + id: "host.x86.debug.64" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "host.x86.debug.64" + } +} +job { + id: "host.x86.ndebug.32" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "host.x86.ndebug.32" + } +} +job { + id: "host.x86.ndebug.64" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "host.x86.ndebug.64" + } +} +job { + id: "host.x86.poison.debug.32" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "host.x86.poison.debug.32" + } +} +job { + id: "host.x86.poison.debug.64" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "host.x86.poison.debug.64" + } +} +job { id: "qemu-armv8-ndebug" realm: "ci" acl_sets: "ci" @@ -215,6 +275,46 @@ job { } } job { + id: "target.arm.poison.debug.32" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "target.arm.poison.debug.32" + } +} +job { + id: "target.arm.poison.debug.64" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "target.arm.poison.debug.64" + } +} +job { + id: "target.arm.poison.ndebug.32" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "target.arm.poison.ndebug.32" + } +} +job { + id: "target.arm.poison.ndebug.64" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "target.arm.poison.ndebug.64" + } +} +job { id: "walleye-armv7-poison-debug" realm: "ci" acl_sets: "ci" @@ -267,8 +367,18 @@ trigger { triggers: "host-x86_64-ndebug" triggers: "host-x86_64-non-gen-cc" triggers: "host-x86_64-poison-debug" + triggers: "host.x86.debug.32" + triggers: "host.x86.debug.64" + triggers: "host.x86.ndebug.32" + triggers: "host.x86.ndebug.64" + triggers: "host.x86.poison.debug.32" + triggers: "host.x86.poison.debug.64" triggers: "qemu-armv8-ndebug" triggers: "qemu-riscv64-ndebug" + triggers: "target.arm.poison.debug.32" + triggers: "target.arm.poison.debug.64" + triggers: "target.arm.poison.ndebug.32" + triggers: "target.arm.poison.ndebug.64" triggers: "walleye-armv7-poison-debug" triggers: "walleye-armv8-poison-debug" triggers: "walleye-armv8-poison-ndebug" @@ -300,8 +410,18 @@ trigger { triggers: "host-x86_64-ndebug" triggers: "host-x86_64-non-gen-cc" triggers: "host-x86_64-poison-debug" + triggers: "host.x86.debug.32" + triggers: "host.x86.debug.64" + triggers: "host.x86.ndebug.32" + triggers: "host.x86.ndebug.64" + triggers: "host.x86.poison.debug.32" + triggers: "host.x86.poison.debug.64" triggers: "qemu-armv8-ndebug" triggers: "qemu-riscv64-ndebug" + triggers: "target.arm.poison.debug.32" + triggers: "target.arm.poison.debug.64" + triggers: "target.arm.poison.ndebug.32" + triggers: "target.arm.poison.ndebug.64" triggers: "walleye-armv7-poison-debug" triggers: "walleye-armv8-poison-debug" triggers: "walleye-armv8-poison-ndebug" @@ -333,8 +453,18 @@ trigger { triggers: "host-x86_64-ndebug" triggers: "host-x86_64-non-gen-cc" triggers: "host-x86_64-poison-debug" + triggers: "host.x86.debug.32" + triggers: "host.x86.debug.64" + triggers: "host.x86.ndebug.32" + triggers: "host.x86.ndebug.64" + triggers: "host.x86.poison.debug.32" + triggers: "host.x86.poison.debug.64" triggers: "qemu-armv8-ndebug" triggers: "qemu-riscv64-ndebug" + triggers: "target.arm.poison.debug.32" + triggers: "target.arm.poison.debug.64" + triggers: "target.arm.poison.ndebug.32" + triggers: "target.arm.poison.ndebug.64" triggers: "walleye-armv7-poison-debug" triggers: "walleye-armv8-poison-debug" triggers: "walleye-armv8-poison-ndebug" @@ -366,8 +496,18 @@ trigger { triggers: "host-x86_64-ndebug" triggers: "host-x86_64-non-gen-cc" triggers: "host-x86_64-poison-debug" + triggers: "host.x86.debug.32" + triggers: "host.x86.debug.64" + triggers: "host.x86.ndebug.32" + triggers: "host.x86.ndebug.64" + triggers: "host.x86.poison.debug.32" + triggers: "host.x86.poison.debug.64" triggers: "qemu-armv8-ndebug" triggers: "qemu-riscv64-ndebug" + triggers: "target.arm.poison.debug.32" + triggers: "target.arm.poison.debug.64" + triggers: "target.arm.poison.ndebug.32" + triggers: "target.arm.poison.ndebug.64" triggers: "walleye-armv7-poison-debug" triggers: "walleye-armv8-poison-debug" triggers: "walleye-armv8-poison-ndebug" diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star index 5a3a29e379..6af3ad58d6 100755 --- a/tools/luci/config/main.star +++ b/tools/luci/config/main.star @@ -175,7 +175,7 @@ luci.gitiles_poller( refs = ["refs/heads/master-art"], ) -def ci_builder(name, category, short_name, dimensions, properties={}, is_fyi=False): +def ci_builder(name, category, short_name, dimensions, properties={}, hidden=False): luci.builder( name = name, bucket = "ci", @@ -203,7 +203,7 @@ def ci_builder(name, category, short_name, dimensions, properties={}, is_fyi=Fal # We can checkout and build in this directory to get fast incremental builds. swarming.cache("art", name = "art"), ], - notifies = ["art-team+chromium-buildbot"], + notifies = ["art-team+chromium-buildbot"] if not hidden else [], triggered_by = [ "art", "libcore", @@ -211,7 +211,7 @@ def ci_builder(name, category, short_name, dimensions, properties={}, is_fyi=Fal "vogar", ], ) - if not is_fyi: + if not hidden: luci.console_view_entry( console_view = "luci", builder = name, @@ -235,9 +235,18 @@ def add_builder(name, check_arg(arch, ["arm", "x86", "riscv"]) check_arg(bitness, [32, 64]) + # Automatically create name based on the configuaration. + default_name = mode + '.' + arch + default_name += '.gsctress' if gcstress else '' + default_name += '.poison' if heap_poisoning else '' + default_name += '' if cc else '.ncc' + default_name += '' if gen_cc else '.ngen' + default_name += '.debug' if debug else '.ndebug' + default_name += '.' + str(bitness) + # Create abbreviated named which is used to create the LUCI console header. # TODO: Rename the builders to remove old device names and make it more uniform. - short_name = name + short_name = name or default_name.replace(".", "-") short_name = short_name.replace("-x86-poison-debug", "-x86-psn") short_name = short_name.replace("-x86-gcstress-debug", "-x86-gcs") short_name = short_name.replace("-x86_64-poison-debug", "-x86_64-psn") @@ -269,7 +278,12 @@ def add_builder(name, # This avoids allocating `userfaultfd` devices for tests that don't need it. dimensions |= {"device_os": "S"} elif mode == "host": - dimensions |= {"os": "Ubuntu-20"} + if name: + dimensions |= {"os": "Ubuntu-20"} + else: + # Test the new host builders with new ubuntu. + dimensions |= {"os": "Ubuntu-22"} + dimensions |= {"cores": "8"} elif mode == "qemu": dimensions |= {"os": "Ubuntu-22"} dimensions |= {"cores": "16"} @@ -278,6 +292,9 @@ def add_builder(name, testrunner_args += ['--debug'] if debug else ['--ndebug'] testrunner_args += ['--gcstress'] if gcstress else [] + hidden = not name # Hide the new builders for now. + name = name or default_name + properties = { "builder_group": "client.art", "bitness": bitness, @@ -301,7 +318,7 @@ def add_builder(name, short_name=short_name.split("-")[-1], dimensions=dimensions, properties={k:v for k, v in properties.items() if v}, - is_fyi=False) + hidden=hidden) add_builder("angler-armv7-debug", 'target', 'arm', 32, debug=True) add_builder("angler-armv7-non-gen-cc", 'target', 'arm', 32, debug=True, cc=False, gen_cc=False) @@ -327,3 +344,13 @@ add_builder("host-x86_64-ndebug", 'host', 'x86', 64) add_builder("host-x86_64-poison-debug", 'host', 'x86', 64, debug=True, heap_poisoning=True) add_builder("qemu-armv8-ndebug", 'qemu', 'arm', 64) add_builder("qemu-riscv64-ndebug", 'qemu', 'riscv', 64) + +def add_builders(): + for bitness in [32, 64]: + add_builder('', 'target', 'arm', bitness, debug=True, heap_poisoning=True) + add_builder('', 'target', 'arm', bitness, heap_poisoning=True) + add_builder('', 'host', 'x86', bitness, debug=True) + add_builder('', 'host', 'x86', bitness) + add_builder('', 'host', 'x86', bitness, debug=True, heap_poisoning=True) + +add_builders()
\ No newline at end of file |