Remove new-gradle bot, other bots are running this now
Additionally, the flag is not longer there so this is failing.
Bug: b/270105162
Change-Id: I1870accae7b9b52f18c554c616f0ed4dcd93774c
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 0e4e8a2..35c7e74 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -1092,43 +1092,6 @@
}
}
builders {
- name: "linux-dex_default-new_gradle"
- swarming_host: "chrome-swarming.appspot.com"
- swarming_tags: "vpython:native-python-wrapper"
- dimensions: "cpu:x86-64"
- dimensions: "normal:true"
- 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",'
- ' "--new-gradle",'
- ' "--tool=r8",'
- ' "--no_internal",'
- ' "--one_line_per_test",'
- ' "--archive_failures"'
- ' ]'
- '}'
- priority: 26
- 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: "linux-dex_default_release"
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 5421e9b..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/linux-dex_default-new_gradle"
- category: "R8"
- short_name: "new_gradle"
- }
- 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 26f944f..ff77a2b 100644
--- a/infra/config/global/generated/luci-notify.cfg
+++ b/infra/config/global/generated/luci-notify.cfg
@@ -336,18 +336,6 @@
}
builders {
bucket: "ci"
- name: "linux-dex_default-new_gradle"
- repository: "https://r8.googlesource.com/r8"
- }
-}
-notifiers {
- notifications {
- on_failure: true
- on_new_failure: true
- notify_blamelist {}
- }
- builders {
- bucket: "ci"
name: "linux-dex_default_release"
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 9ad6e3f..60c9a25 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -442,20 +442,6 @@
}
}
job {
- id: "linux-dex_default-new_gradle"
- realm: "ci"
- acl_sets: "ci"
- triggering_policy {
- kind: GREEDY_BATCHING
- max_concurrent_invocations: 1
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "linux-dex_default-new_gradle"
- }
-}
-job {
id: "linux-dex_default_release"
realm: "ci"
acl_sets: "ci"
@@ -826,7 +812,6 @@
triggers: "linux-android-8.1.0"
triggers: "linux-android-9.0.0"
triggers: "linux-dex_default"
- triggers: "linux-dex_default-new_gradle"
triggers: "linux-internal"
triggers: "linux-jdk11"
triggers: "linux-jdk17"
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index 755c550..dcf12da 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.15"
+ version: "1.39.20"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 86bbec8..11fbd09 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -312,18 +312,6 @@
expiration_timeout = time.hour * 35,
)
-r8_builder(
- name = "linux-dex_default-new_gradle",
- execution_timeout = time.hour * 6,
- expiration_timeout = time.hour * 35,
- dimensions = get_dimensions(),
- max_concurrent_invocations = 1,
- properties = {
- "test_options" : ["--runtimes=dex-default", "--command_cache_dir=/tmp/ccache", "--new-gradle"] + common_test_options,
- "builder_group" : "internal.client.r8"
- }
-)
-
r8_tester_with_default("linux-dex_default",
["--runtimes=dex-default", "--command_cache_dir=/tmp/ccache"],
max_concurrent_invocations = 2)
