Remove smali builder from main console
Also remove trigger and fix arguments passed by trigger.
Bug: b/279576701
Change-Id: Ib43bf1a03785bd8ae8911275e32348d90e6e472d
diff --git a/infra/config/global/generated/luci-milo.cfg b/infra/config/global/generated/luci-milo.cfg
index 4073c3d..b1481fe 100644
--- a/infra/config/global/generated/luci-milo.cfg
+++ b/infra/config/global/generated/luci-milo.cfg
@@ -126,11 +126,6 @@
short_name: "kotlin_old"
}
builders {
- name: "buildbucket/luci.r8.ci/smali"
- category: "R8"
- short_name: "smali"
- }
- builders {
name: "buildbucket/luci.r8.ci/lib_desugar-archive-jdk11"
category: "library_desugar"
short_name: "jdk11"
diff --git a/infra/config/global/generated/luci-notify.cfg b/infra/config/global/generated/luci-notify.cfg
index 5417911..fa8d5b0 100644
--- a/infra/config/global/generated/luci-notify.cfg
+++ b/infra/config/global/generated/luci-notify.cfg
@@ -540,18 +540,6 @@
}
builders {
bucket: "ci"
- name: "smali"
- repository: "https://r8.googlesource.com/r8"
- }
-}
-notifiers {
- notifications {
- on_failure: true
- on_new_failure: true
- notify_blamelist {}
- }
- builders {
- bucket: "ci"
name: "windows"
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 982d085..e59d20c 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -820,7 +820,6 @@
triggers: "linux-kotlin_old"
triggers: "linux-none"
triggers: "linux-run-on-app-dump"
- triggers: "smali"
triggers: "windows"
gitiles {
repo: "https://r8.googlesource.com/r8"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 1e374ed..d9201a8 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -147,7 +147,6 @@
refs = ["refs/heads/.*"]
)
-
view_builders = []
def builder_view(name, category, short_name):
@@ -412,6 +411,8 @@
r8_builder(
"smali",
+ category = "aux",
+ trigger = False,
dimensions = get_dimensions(smali=True),
triggering_policy = scheduler.policy(
kind = scheduler.GREEDY_BATCHING_KIND,
@@ -434,9 +435,15 @@
"Release|R8",
]
+categories_with_no_console = [
+ "aux",
+]
+
def add_view_entries():
# Ensure that all categories are ordered
for v in view_builders:
+ if v[1] in categories_with_no_console:
+ continue
if not v[1] in order_of_categories:
fail()
for category in order_of_categories:
diff --git a/tools/trigger.py b/tools/trigger.py
index 0fd8b64..b3e09f2 100755
--- a/tools/trigger.py
+++ b/tools/trigger.py
@@ -104,7 +104,7 @@
'add',
'r8/ci/%s' % SMALI_BOT,
'-p',
- '\'test_options=["--version", "%s"]\'' % version
+ 'test_options=["--version", "%s"]' % version
]
subprocess.check_call(cmd)
