Merge "Reduce timeout for non jctf bots"
diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
index ad8bd51..65d8778 100644
--- a/infra/config/global/luci-milo.cfg
+++ b/infra/config/global/luci-milo.cfg
@@ -91,11 +91,13 @@
category: "D8"
short_name: "jctf"
}
- builders {
- name: "buildbucket/luci.r8.ci/windows"
- category: "win"
- short_name: "win"
- }
+ # TODO(ricow): Windows on the release branches currently do not work
+ # There is no java available.
+ # builders {
+ # name: "buildbucket/luci.r8.ci/windows"
+ # category: "win"
+ # short_name: "win"
+ # }
}
consoles {
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 3fa5872..0d30703 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -67,13 +67,16 @@
triggers: "linux-android-6.0.1_release"
triggers: "linux-android-7.0.0_release"
triggers: "linux_release"
- triggers: "windows_release"
# TODO(ricow): enable remaining
# triggers: "archive_release"
# triggers: "d8-linux-jctf_release"
# triggers: "linux-internal_release"
# triggers: "linux-jctf_release"
+
+ # TODO(ricow): Windows on the release branches currently do not work
+ # There is no java available.
+ # triggers: "windows_release"
}
job {
