Setup new bots for 1.5 branch
There is a number of bots that did not get setup until 1.5, add these specificly
as being triggered on 1.5. There is also a number of bots that are no longer valid in 1.5,
don't trigger these on 1.5 (they are a no-op, but we still pull down dependencies)
Bug: 131632772
Change-Id: Id7bd2b434e62199fe1fc1878f6c86fcd9ae506b4
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 8a3f94f..7bcba6a 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -295,7 +295,15 @@
properties: "dex_vm:8.1.0"
}
}
-
+ builders {
+ name: "linux-android-8.1.0_release"
+ mixins: "linux"
+ mixins: "normal"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:8.1.0"
+ }
+ }
builders {
name: "linux-android-9.0.0"
mixins: "linux"
@@ -306,6 +314,15 @@
}
}
builders {
+ name: "linux-android-9.0.0_release"
+ mixins: "linux"
+ mixins: "normal"
+ recipe {
+ properties: "tool:r8"
+ properties: "dex_vm:9.0.0"
+ }
+ }
+ builders {
name: "linux-internal"
mixins: "linux"
mixins: "internal"
@@ -330,6 +347,14 @@
}
}
builders {
+ name: "linux-run-on-as-app_release"
+ mixins: "linux"
+ mixins: "normal"
+ recipe {
+ properties: "run_on_apps:True"
+ }
+ }
+ builders {
name: "linux-jctf"
mixins: "linux"
mixins: "jctf"
@@ -363,6 +388,17 @@
}
}
builders {
+ name: "r8cf-linux-jctf_release"
+ mixins: "linux"
+ mixins: "jctf"
+ execution_timeout_secs: 43200 # 12h
+ recipe {
+ properties: "tool:r8cf"
+ properties: "dex_vm:all"
+ properties: "only_jctf:True"
+ }
+ }
+ builders {
name: "windows"
mixins: "win"
recipe {
diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
index 8ce6ae6..bb7d6da 100644
--- a/infra/config/global/luci-milo.cfg
+++ b/infra/config/global/luci-milo.cfg
@@ -111,11 +111,31 @@
short_name: "7.0.0"
}
builders {
+ name: "buildbucket/luci.r8.ci/linux-android-8.1.0_release"
+ category: "R8 release"
+ short_name: "8.1.0"
+ }
+ builders {
+ name: "buildbucket/luci.r8.ci/linux-android-9.0.0_release"
+ category: "R8 release"
+ short_name: "9.0.0"
+ }
+ builders {
name: "buildbucket/luci.r8.ci/linux-internal_release"
category: "R8 release"
short_name: "internal"
}
builders {
+ name: "buildbucket/luci.r8.ci/linux-run-on-as-app_release"
+ category: "R8 release"
+ short_name: "apps"
+ }
+ builders {
+ name: "buildbucket/luci.r8.ci/r8cf-linux-jctf_release"
+ category: "R8 release"
+ short_name: "cf-jctf"
+ }
+ builders {
name: "buildbucket/luci.r8.ci/linux-jctf_release"
category: "R8 release"
short_name: "jctf"
diff --git a/infra/config/global/luci-notify.cfg b/infra/config/global/luci-notify.cfg
index ffdfd6a..0b6bb86 100644
--- a/infra/config/global/luci-notify.cfg
+++ b/infra/config/global/luci-notify.cfg
@@ -109,17 +109,27 @@
repository: "https://r8.googlesource.com/r8"
}
builders {
+ name: "linux-android-7.0.0_release"
+ bucket: "ci"
+ repository: "https://r8.googlesource.com/r8"
+ }
+ builders {
name: "linux-android-8.1.0"
bucket: "ci"
repository: "https://r8.googlesource.com/r8"
}
builders {
+ name: "linux-android-8.1.0_release"
+ bucket: "ci"
+ repository: "https://r8.googlesource.com/r8"
+ }
+ builders {
name: "linux-android-9.0.0"
bucket: "ci"
repository: "https://r8.googlesource.com/r8"
}
builders {
- name: "linux-android-7.0.0_release"
+ name: "linux-android-9.0.0_release"
bucket: "ci"
repository: "https://r8.googlesource.com/r8"
}
@@ -139,6 +149,11 @@
repository: "https://r8.googlesource.com/r8"
}
builders {
+ name: "linux-run-on-as-app_release"
+ bucket: "ci"
+ repository: "https://r8.googlesource.com/r8"
+ }
+ builders {
name: "linux-jctf"
bucket: "ci"
repository: "https://r8.googlesource.com/r8"
@@ -154,6 +169,11 @@
repository: "https://r8.googlesource.com/r8"
}
builders {
+ name: "r8cf-linux-jctf_release"
+ bucket: "ci"
+ repository: "https://r8.googlesource.com/r8"
+ }
+ builders {
name: "windows"
bucket: "ci"
repository: "https://r8.googlesource.com/r8"
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 6741401..e733f89 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -49,12 +49,6 @@
refs: "regexp:refs/heads/d8.*"
}
triggers: "archive_release"
- 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"
@@ -65,18 +59,38 @@
triggers: "linux_release"
}
-# Windows does not work until we go to 1.5, no java
+
+# The need for d8 specific bots was removed in 1.5, only trigger on 1.4.
trigger {
- id: "windows-branch-gitiles-trigger"
+ id: "1.4-branch-gitiles-trigger"
+ acl_sets: "default"
+ gitiles: {
+ repo: "https://r8.googlesource.com/r8"
+ refs: "regexp:refs/heads/d8.1.4"
+ }
+ 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"
+}
+
+# These bots don't work until 1.5
+trigger {
+ id: "1.5-branch-gitiles-trigger"
acl_sets: "default"
gitiles: {
repo: "https://r8.googlesource.com/r8"
refs: "regexp:refs/heads/d8.1.5"
}
+ triggers: "linux-android-8.1.0_release"
+ triggers: "linux-android-9.0.0_release"
+ triggers: "linux-run-on-as-app_release"
+ triggers: "r8cf-linux-jctf_release"
triggers: "windows_release"
}
-
job {
id: "archive"
acl_sets: "default"
@@ -306,6 +320,20 @@
}
job {
+ id: "linux-android-8.1.0_release"
+ acl_sets: "default"
+ triggering_policy: {
+ max_concurrent_invocations: 2
+ }
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.r8.ci"
+ builder: "linux-android-8.1.0_release"
+ }
+}
+
+
+job {
id: "linux-android-9.0.0"
acl_sets: "default"
triggering_policy: {
@@ -319,6 +347,19 @@
}
job {
+ id: "linux-android-9.0.0_release"
+ acl_sets: "default"
+ triggering_policy: {
+ max_concurrent_invocations: 2
+ }
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.r8.ci"
+ builder: "linux-android-9.0.0_release"
+ }
+}
+
+job {
id: "linux-internal"
acl_sets: "default"
buildbucket {
@@ -349,6 +390,17 @@
}
job {
+ id: "linux-run-on-as-app_release"
+ acl_sets: "default"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.r8.ci"
+ builder: "linux-run-on-as-app_release"
+ }
+}
+
+
+job {
id: "linux-jctf"
acl_sets: "default"
buildbucket {
@@ -389,6 +441,16 @@
}
job {
+ id: "r8cf-linux-jctf_release"
+ acl_sets: "default"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.r8.ci"
+ builder: "r8cf-linux-jctf_release"
+ }
+}
+
+job {
id: "windows"
triggering_policy: {
max_concurrent_invocations: 3
