Use art command cache for all normal linux test bots
Bug: b/286019067
Change-Id: I8fe05a4b9aada41f4bb0e5d3df18c5e4f2f139ed
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 388f09b..df34a86 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -77,42 +77,6 @@
}
}
builders {
- name: "cached"
- swarming_host: "chrome-swarming.appspot.com"
- swarming_tags: "vpython:native-python-wrapper"
- dimensions: "cores:8"
- dimensions: "cpu:x86-64"
- dimensions: "os:Ubuntu-20.04"
- dimensions: "pool:luci.r8.ci"
- exe {
- cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
- cipd_version: "refs/heads/master"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "builder_group": "internal.client.r8",'
- ' "recipe": "rex",'
- ' "test_options": ['
- ' "--runtimes=dex-default",'
- ' "--command_cache_dir=/tmp/ccache",'
- ' "--tool=r8",'
- ' "--no_internal",'
- ' "--one_line_per_test",'
- ' "--archive_failures"'
- ' ]'
- '}'
- priority: 25
- execution_timeout_secs: 21600
- expiration_secs: 126000
- build_numbers: YES
- service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
name: "check"
swarming_host: "chrome-swarming.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
@@ -298,6 +262,7 @@
' "test_options": ['
' "--dex_vm=10.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -335,6 +300,7 @@
' "test_options": ['
' "--dex_vm=10.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -372,6 +338,7 @@
' "test_options": ['
' "--dex_vm=12.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -409,6 +376,7 @@
' "test_options": ['
' "--dex_vm=12.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -446,6 +414,7 @@
' "test_options": ['
' "--dex_vm=13.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -483,6 +452,7 @@
' "test_options": ['
' "--dex_vm=13.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -520,6 +490,7 @@
' "test_options": ['
' "--dex_vm=14.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -557,6 +528,7 @@
' "test_options": ['
' "--dex_vm=14.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -594,6 +566,7 @@
' "test_options": ['
' "--dex_vm=4.0.4",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -631,6 +604,7 @@
' "test_options": ['
' "--dex_vm=4.0.4",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -668,6 +642,7 @@
' "test_options": ['
' "--dex_vm=4.4.4",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -705,6 +680,7 @@
' "test_options": ['
' "--dex_vm=4.4.4",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -742,6 +718,7 @@
' "test_options": ['
' "--dex_vm=5.1.1",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -779,6 +756,7 @@
' "test_options": ['
' "--dex_vm=5.1.1",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -816,6 +794,7 @@
' "test_options": ['
' "--dex_vm=6.0.1",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -853,6 +832,7 @@
' "test_options": ['
' "--dex_vm=6.0.1",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -890,6 +870,7 @@
' "test_options": ['
' "--dex_vm=7.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -927,6 +908,7 @@
' "test_options": ['
' "--dex_vm=7.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -964,6 +946,7 @@
' "test_options": ['
' "--dex_vm=8.1.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1001,6 +984,7 @@
' "test_options": ['
' "--dex_vm=8.1.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1038,6 +1022,7 @@
' "test_options": ['
' "--dex_vm=9.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1075,6 +1060,7 @@
' "test_options": ['
' "--dex_vm=9.0.0",'
' "--all_tests",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1111,6 +1097,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=dex-default",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1147,6 +1134,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=dex-default",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1249,6 +1237,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=jdk11",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1285,6 +1274,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=jdk11",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1321,6 +1311,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=jdk17",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1357,6 +1348,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=jdk17",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1393,6 +1385,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=jdk8",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1429,6 +1422,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=jdk8",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1465,6 +1459,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=jdk9",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1501,6 +1496,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=jdk9",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1611,6 +1607,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=none",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
@@ -1647,6 +1644,7 @@
' "recipe": "rex",'
' "test_options": ['
' "--runtimes=none",'
+ ' "--command_cache_dir=/tmp/ccache",'
' "--tool=r8",'
' "--no_internal",'
' "--one_line_per_test",'
diff --git a/infra/config/global/generated/luci-milo.cfg b/infra/config/global/generated/luci-milo.cfg
index 8d17a6a..0f163d5 100644
--- a/infra/config/global/generated/luci-milo.cfg
+++ b/infra/config/global/generated/luci-milo.cfg
@@ -21,11 +21,6 @@
short_name: "check"
}
builders {
- name: "buildbucket/luci.r8.ci/cached"
- category: "R8"
- short_name: "cached"
- }
- builders {
name: "buildbucket/luci.r8.ci/linux-dex_default"
category: "R8"
short_name: "dex_default"
diff --git a/infra/config/global/generated/luci-notify.cfg b/infra/config/global/generated/luci-notify.cfg
index d0fb763..ff77a2b 100644
--- a/infra/config/global/generated/luci-notify.cfg
+++ b/infra/config/global/generated/luci-notify.cfg
@@ -36,18 +36,6 @@
}
builders {
bucket: "ci"
- name: "cached"
- repository: "https://r8.googlesource.com/r8"
- }
-}
-notifiers {
- notifications {
- on_failure: true
- on_new_failure: true
- notify_blamelist {}
- }
- builders {
- bucket: "ci"
name: "check"
repository: "https://r8.googlesource.com/r8"
}
diff --git a/infra/config/global/generated/luci-scheduler.cfg b/infra/config/global/generated/luci-scheduler.cfg
index faedc8a..3782376 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -35,21 +35,6 @@
}
}
job {
- id: "cached"
- realm: "ci"
- acl_sets: "ci"
- triggering_policy {
- kind: GREEDY_BATCHING
- max_concurrent_invocations: 1
- max_batch_size: 42
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "cached"
- }
-}
-job {
id: "check"
realm: "ci"
acl_sets: "ci"
@@ -813,7 +798,6 @@
realm: "ci"
acl_sets: "ci"
triggers: "archive"
- triggers: "cached"
triggers: "check"
triggers: "desugared_library-jdk11_head"
triggers: "linux-android-10.0.0"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 520bb77..01c0d92 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -301,60 +301,45 @@
expiration_timeout = time.hour * 35,
)
-r8_builder(
- "cached",
- category = "R8",
- dimensions = get_dimensions(),
- triggering_policy = scheduler.policy(
- kind = scheduler.GREEDY_BATCHING_KIND,
- max_batch_size = 42,
- max_concurrent_invocations = 1
- ),
- priority = 25,
- properties = {
- "test_options" : ["--runtimes=dex-default",
- "--command_cache_dir=/tmp/ccache"] + common_test_options,
- "builder_group" : "internal.client.r8"
- },
- execution_timeout = time.hour * 6,
- expiration_timeout = time.hour * 35,
-)
-
-
-
-r8_tester_with_default("linux-dex_default", ["--runtimes=dex-default"])
-r8_tester_with_default("linux-none", ["--runtimes=none"])
-r8_tester_with_default("linux-jdk8", ["--runtimes=jdk8"])
-r8_tester_with_default("linux-jdk9", ["--runtimes=jdk9"])
-r8_tester_with_default("linux-jdk11", ["--runtimes=jdk11"])
-r8_tester_with_default("linux-jdk17", ["--runtimes=jdk17"],
- release_trigger=["branch-gitiles-3.3-forward"])
+r8_tester_with_default("linux-dex_default",
+ ["--runtimes=dex-default", "--command_cache_dir=/tmp/ccache"])
+r8_tester_with_default("linux-none",
+ ["--runtimes=none", "--command_cache_dir=/tmp/ccache"])
+r8_tester_with_default("linux-jdk8",
+ ["--runtimes=jdk8", "--command_cache_dir=/tmp/ccache"])
+r8_tester_with_default("linux-jdk9",
+ ["--runtimes=jdk9", "--command_cache_dir=/tmp/ccache"])
+r8_tester_with_default("linux-jdk11",
+ ["--runtimes=jdk11", "--command_cache_dir=/tmp/ccache"])
+r8_tester_with_default("linux-jdk17",
+ ["--runtimes=jdk17", "--command_cache_dir=/tmp/ccache"],
+ release_trigger=["branch-gitiles-3.3-forward"])
r8_tester_with_default("linux-android-4.0.4",
- ["--dex_vm=4.0.4", "--all_tests"])
+ ["--dex_vm=4.0.4", "--all_tests", "--command_cache_dir=/tmp/ccache"])
r8_tester_with_default("linux-android-4.4.4",
- ["--dex_vm=4.4.4", "--all_tests"])
+ ["--dex_vm=4.4.4", "--all_tests", "--command_cache_dir=/tmp/ccache"])
r8_tester_with_default("linux-android-5.1.1",
- ["--dex_vm=5.1.1", "--all_tests"])
+ ["--dex_vm=5.1.1", "--all_tests", "--command_cache_dir=/tmp/ccache"])
r8_tester_with_default("linux-android-6.0.1",
- ["--dex_vm=6.0.1", "--all_tests"])
+ ["--dex_vm=6.0.1", "--all_tests", "--command_cache_dir=/tmp/ccache"])
r8_tester_with_default("linux-android-7.0.0",
- ["--dex_vm=7.0.0", "--all_tests"])
+ ["--dex_vm=7.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"])
r8_tester_with_default("linux-android-8.1.0",
- ["--dex_vm=8.1.0", "--all_tests"])
+ ["--dex_vm=8.1.0", "--all_tests", "--command_cache_dir=/tmp/ccache"])
r8_tester_with_default("linux-android-9.0.0",
- ["--dex_vm=9.0.0", "--all_tests"])
+ ["--dex_vm=9.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"])
r8_tester_with_default("linux-android-10.0.0",
- ["--dex_vm=10.0.0", "--all_tests"])
+ ["--dex_vm=10.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"])
r8_tester_with_default("linux-android-12.0.0",
- ["--dex_vm=12.0.0", "--all_tests"],
+ ["--dex_vm=12.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
release_trigger=["branch-gitiles-3.2-forward"])
r8_tester_with_default("linux-android-13.0.0",
- ["--dex_vm=13.0.0", "--all_tests"],
+ ["--dex_vm=13.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
release_trigger=["branch-gitiles-3.3-forward"])
r8_tester_with_default("linux-android-14.0.0",
- ["--dex_vm=14.0.0", "--all_tests"],
+ ["--dex_vm=14.0.0", "--all_tests", "--command_cache_dir=/tmp/ccache"],
release_trigger=["branch-gitiles-8.1-forward"])
