Remove library desugar head bot
Change-Id: I4dff1a2d035202ddc8cd3210d4bbc074af4c3bc3
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 5c3f1b9..388f09b 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -142,42 +142,6 @@
}
}
builders {
- name: "desugared_library-head"
- 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": ['
- ' "--one_line_per_test",'
- ' "--archive_failures",'
- ' "--no_internal",'
- ' "--no_arttests",'
- ' "--desugared-library",'
- ' "HEAD"'
- ' ]'
- '}'
- priority: 26
- execution_timeout_secs: 43200
- 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: "desugared_library-jdk11_head"
swarming_host: "chrome-swarming.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
diff --git a/infra/config/global/generated/luci-milo.cfg b/infra/config/global/generated/luci-milo.cfg
index b0f2546..8d17a6a 100644
--- a/infra/config/global/generated/luci-milo.cfg
+++ b/infra/config/global/generated/luci-milo.cfg
@@ -151,11 +151,6 @@
short_name: "jdk8"
}
builders {
- name: "buildbucket/luci.r8.ci/desugared_library-head"
- category: "library_desugar"
- short_name: "head"
- }
- builders {
name: "buildbucket/luci.r8.ci/desugared_library-jdk11_head"
category: "library_desugar"
short_name: "jdk11_head"
diff --git a/infra/config/global/generated/luci-notify.cfg b/infra/config/global/generated/luci-notify.cfg
index 048dc7a..d0fb763 100644
--- a/infra/config/global/generated/luci-notify.cfg
+++ b/infra/config/global/generated/luci-notify.cfg
@@ -60,18 +60,6 @@
}
builders {
bucket: "ci"
- name: "desugared_library-head"
- repository: "https://r8.googlesource.com/r8"
- }
-}
-notifiers {
- notifications {
- on_failure: true
- on_new_failure: true
- notify_blamelist {}
- }
- builders {
- bucket: "ci"
name: "desugared_library-jdk11_head"
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 91a12e2..faedc8a 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -65,20 +65,6 @@
}
}
job {
- id: "desugared_library-head"
- realm: "ci"
- acl_sets: "ci"
- triggering_policy {
- kind: GREEDY_BATCHING
- max_concurrent_invocations: 4
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "desugared_library-head"
- }
-}
-job {
id: "desugared_library-jdk11_head"
realm: "ci"
acl_sets: "ci"
@@ -829,7 +815,6 @@
triggers: "archive"
triggers: "cached"
triggers: "check"
- triggers: "desugared_library-head"
triggers: "desugared_library-jdk11_head"
triggers: "linux-android-10.0.0"
triggers: "linux-android-12.0.0"
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index ee2ef9d..c275232 100644
--- a/infra/config/global/generated/project.cfg
+++ b/infra/config/global/generated/project.cfg
@@ -7,7 +7,7 @@
name: "r8"
access: "group:all"
lucicfg {
- version: "1.39.8"
+ version: "1.39.11"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index dd14d77..520bb77 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -400,30 +400,28 @@
app_dump()
def desugared_library():
- for name in ["head", "jdk11_head"]:
- test_options = [
- "--one_line_per_test",
- "--archive_failures",
- "--no_internal",
- "--no_arttests",
- "--desugared-library",
- "HEAD"
- ]
- if "jdk11" in name:
- test_options = test_options + ["--desugared-library-configuration", "jdk11"]
- properties = {
- "builder_group" : "internal.client.r8",
- "test_options" : test_options,
- }
- name = "desugared_library-" + name
- r8_builder(
- name,
- category = "library_desugar",
- dimensions = get_dimensions(),
- execution_timeout = time.hour * 12,
- expiration_timeout = time.hour * 35,
- properties = properties,
- )
+ test_options = [
+ "--one_line_per_test",
+ "--archive_failures",
+ "--no_internal",
+ "--no_arttests",
+ "--desugared-library",
+ "HEAD",
+ "--desugared-library-configuration",
+ "jdk11"
+ ]
+ properties = {
+ "builder_group" : "internal.client.r8",
+ "test_options" : test_options,
+ }
+ r8_builder(
+ "desugared_library-jdk11_head",
+ category = "library_desugar",
+ dimensions = get_dimensions(),
+ execution_timeout = time.hour * 12,
+ expiration_timeout = time.hour * 35,
+ properties = properties,
+ )
desugared_library()
r8_builder(
