Revert "Add a check release column to check for missing cherry-picks"
Bug: b/286177952
This reverts commit 0252f5d2269bda272e573837da5b12fba493dc84.
Reason for revert: should run main script content
Change-Id: Ib11515296a6a13115129af3c1b07061a8bc61bf3
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 7c515d5..aa285e0 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -77,35 +77,6 @@
}
}
builders {
- name: "check_release"
- 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_wrapper": "tools/check-cherry-picks.py"'
- '}'
- priority: 25
- execution_timeout_secs: 1800
- 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-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 6020a06..b1481fe 100644
--- a/infra/config/global/generated/luci-milo.cfg
+++ b/infra/config/global/generated/luci-milo.cfg
@@ -156,11 +156,6 @@
short_name: "archive"
}
builders {
- name: "buildbucket/luci.r8.ci/check_release"
- category: "Release|archive"
- short_name: "check"
- }
- builders {
name: "buildbucket/luci.r8.ci/linux-dex_default_release"
category: "Release|R8"
short_name: "dex_default"
diff --git a/infra/config/global/generated/luci-notify.cfg b/infra/config/global/generated/luci-notify.cfg
index 406f9e4..fa8d5b0 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: "check_release"
- repository: "https://r8.googlesource.com/r8"
- }
-}
-notifiers {
- notifications {
- on_failure: true
- on_new_failure: true
- notify_blamelist {}
- }
- builders {
- bucket: "ci"
name: "desugared_library-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 cc010ab..e59d20c 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -35,21 +35,6 @@
}
}
job {
- id: "check_release"
- realm: "ci"
- acl_sets: "ci"
- triggering_policy {
- kind: GREEDY_BATCHING
- max_concurrent_invocations: 3
- max_batch_size: 1
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "check_release"
- }
-}
-job {
id: "desugared_library-head"
realm: "ci"
acl_sets: "ci"
@@ -785,7 +770,6 @@
realm: "ci"
acl_sets: "ci"
triggers: "archive_release"
- triggers: "check_release"
triggers: "linux-android-10.0.0_release"
triggers: "linux-android-4.0.4_release"
triggers: "linux-android-4.4.4_release"
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index ee2ef9d..cfee79c 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.4"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 74c5548..d9201a8 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -283,24 +283,6 @@
)
archivers()
-r8_builder(
- "check_release",
- category = "archive",
- dimensions = get_dimensions(),
- triggering_policy = scheduler.policy(
- kind = scheduler.GREEDY_BATCHING_KIND,
- max_batch_size = 1,
- max_concurrent_invocations = 3
- ),
- priority = 25,
- properties = {
- "test_wrapper" : "tools/check-cherry-picks.py",
- "builder_group" : "internal.client.r8"
- },
- execution_timeout = time.minute * 30,
- 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"])
