Enable more builders on LUCI
Split scheduler in two, one for release commits and one for normal
Bug: 124643718
Change-Id: Ie7eea6ff4079acb2cc70dedb0985a68686c696a0
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 6e9531a..73b6acb 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -72,7 +72,7 @@
dimensions: "cpu:x86-64"
dimensions: "pool:luci.r8.ci"
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- execution_timeout_secs: 10800 # 3h
+ execution_timeout_secs: 43200 # 12h
swarming_tags: "vpython:native-python-wrapper"
build_numbers: YES
luci_migration_host: "luci-migration.appspot.com"
@@ -86,12 +86,19 @@
builders {
name: "archive"
mixins: "linux"
- # TODO(ricow): set archive flag when we flip over
+ recipe {
+ # TODO(ricow): set archive flag when we flip over
+ # properties: "archive:True"
+ }
}
builders {
name: "archive_release"
mixins: "linux"
- # TODO(ricow): set archive flag when we flip over
+ recipe {
+ # TODO(ricow): set archive flag when we flip over
+ # properties: "archive:True"
+ }
+
}
builders {
name: "d8-linux"
@@ -104,34 +111,66 @@
builders {
name: "d8-linux-android-4.0.4"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ properties: "dex_vm:4.0.4"
+ }
}
builders {
name: "d8-linux-android-4.0.4_release"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ properties: "dex_vm:4.0.4"
+ }
}
builders {
name: "d8-linux-android-4.4.4"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ properties: "dex_vm:4.4.4"
+ }
}
builders {
name: "d8-linux-android-4.4.4_release"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ properties: "dex_vm:4.4.4"
+ }
}
builders {
name: "d8-linux-android-5.1.1"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ properties: "dex_vm:5.1.1"
+ }
}
builders {
name: "d8-linux-android-5.1.1_release"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ properties: "dex_vm:5.1.1"
+ }
}
builders {
name: "d8-linux-android-6.0.1"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ properties: "dex_vm:6.0.1"
+ }
}
builders {
name: "d8-linux-android-6.0.1_release"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ properties: "dex_vm:6.0.1"
+ }
}
builders {
name: "d8-linux-android-7.0.0"
@@ -144,18 +183,35 @@
builders {
name: "d8-linux-android-7.0.0_release"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ properties: "dex_vm:7.0.0"
+ }
}
builders {
name: "d8-linux-jctf"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ properties: "dex_vm:all"
+ properties: "only_jctf:True"
+ }
}
builders {
name: "d8-linux-jctf_release"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ properties: "dex_vm:all"
+ properties: "only_jctf:True"
+ }
}
builders {
name: "d8-linux_release"
mixins: "linux"
+ recipe {
+ properties: "tool:d8"
+ }
}
builders {
name: "linux"
@@ -165,36 +221,75 @@
}
}
builders {
+ name: "linux_release"
+ mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ }
+ }
+ builders {
name: "linux-android-4.0.4"
mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:4.0.4"
+ }
}
builders {
name: "linux-android-4.0.4_release"
mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:4.0.4"
+ }
}
builders {
name: "linux-android-4.4.4"
mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:4.4.4"
+ }
}
builders {
name: "linux-android-4.4.4_release"
mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:4.4.4"
+ }
}
builders {
name: "linux-android-5.1.1"
mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:5.1.1"
+ }
}
builders {
name: "linux-android-5.1.1_release"
mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:5.1.1"
+ }
}
builders {
name: "linux-android-6.0.1"
mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:6.0.1"
+ }
}
builders {
name: "linux-android-6.0.1_release"
mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:6.0.1"
+ }
}
builders {
name: "linux-android-7.0.0"
@@ -207,38 +302,61 @@
builders {
name: "linux-android-7.0.0_release"
mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:7.0.0"
+ }
}
builders {
name: "linux-internal"
mixins: "linux"
+ # TODO(move)
}
builders {
name: "linux-internal_release"
mixins: "linux"
+ # TODO(move)
}
builders {
name: "linux-jctf"
mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:all"
+ properties: "only_jctf=True"
+ }
}
builders {
name: "linux-jctf_release"
mixins: "linux"
- }
- builders {
- name: "linux_release"
- mixins: "linux"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:all"
+ properties: "only_jctf=True"
+ }
}
builders {
name: "r8cf-linux-jctf"
mixins: "linux"
+ recipe {
+ properties: "tool:r8cf"
+ properties: "dex_vm:all"
+ properties: "only_jctf=True"
+ }
}
builders {
name: "windows"
mixins: "win"
+ recipe {
+ properties: "tool:r8"
+ }
}
builders {
name: "windows_release"
mixins: "win"
+ recipe {
+ properties: "tool:r8"
+ }
}
}
}
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 40682b7..3fa5872 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -25,44 +25,55 @@
}
triggers: "d8-linux"
- triggers: "linux"
+ triggers: "d8-linux"
+ triggers: "d8-linux-android-4.0.4"
+ triggers: "d8-linux-android-4.4.4"
+ triggers: "d8-linux-android-5.1.1"
+ triggers: "d8-linux-android-6.0.1"
triggers: "d8-linux-android-7.0.0"
+ triggers: "d8-linux-jctf"
+ triggers: "linux"
+ triggers: "linux"
+ triggers: "linux-android-4.0.4"
+ triggers: "linux-android-4.4.4"
+ triggers: "linux-android-5.1.1"
+ triggers: "linux-android-6.0.1"
triggers: "linux-android-7.0.0"
+ triggers: "windows"
# TODO(ricow): enable remaining
# triggers: "archive"
- # triggers: "archive_release"
- # triggers: "d8-linux"
- # triggers: "d8-linux-android-4.0.4"
- # triggers: "d8-linux-android-4.0.4_release"
- # triggers: "d8-linux-android-4.4.4"
- # triggers: "d8-linux-android-4.4.4_release"
- # triggers: "d8-linux-android-5.1.1"
- # triggers: "d8-linux-android-5.1.1_release"
- # triggers: "d8-linux-android-6.0.1"
- # triggers: "d8-linux-android-6.0.1_release"
- # triggers: "d8-linux-android-7.0.0_release"
- # triggers: "d8-linux-jctf"
- # triggers: "d8-linux-jctf_release"
- # triggers: "d8-linux_release"
- # triggers: "linux"
- # triggers: "linux-android-4.0.4"
- # triggers: "linux-android-4.0.4_release"
- # triggers: "linux-android-4.4.4"
- # triggers: "linux-android-4.4.4_release"
- # triggers: "linux-android-5.1.1"
- # triggers: "linux-android-5.1.1_release"
- # triggers: "linux-android-6.0.1"
- # triggers: "linux-android-6.0.1_release"
- # triggers: "linux-android-7.0.0_release"
# triggers: "linux-internal"
- # triggers: "linux-internal_release"
# triggers: "linux-jctf"
- # triggers: "linux-jctf_release"
- # triggers: "linux_release"
# triggers: "r8cf-linux-jctf"
- # triggers: "windows"
- # triggers: "windows_release"
+}
+
+trigger {
+ id: "branch-gitiles-trigger"
+ acl_sets: "default"
+ gitiles: {
+ repo: "https://r8.googlesource.com/r8"
+ refs: "regexp:refs/heads/d8.*"
+ }
+ triggers: "d8-linux-android-4.0.4_release"
+ triggers: "d8-linux-android-4.4.4_release"
+ triggers: "d8-linux-android-5.1.1_release"
+ triggers: "d8-linux-android-6.0.1_release"
+ triggers: "d8-linux-android-7.0.0_release"
+ triggers: "d8-linux_release"
+ triggers: "linux-android-4.0.4_release"
+ triggers: "linux-android-4.4.4_release"
+ triggers: "linux-android-5.1.1_release"
+ 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"
}
job {
