Merge "Ignore applymapping test until classpath is added"
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index acc511c..1040635 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -17,6 +17,21 @@
}
builder_mixins {
+ name: "normal"
+ dimensions: "normal:true"
+}
+
+builder_mixins {
+ name: "jctf"
+ dimensions: "jctf:true"
+}
+
+builder_mixins {
+ name: "internal"
+ dimensions: "internal:true"
+}
+
+builder_mixins {
name: "mac"
dimensions: "os:Mac-10.13"
dimensions: "cores:" # Macs can be 4 or 8 cores.
@@ -106,6 +121,7 @@
builders {
name: "d8-linux"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
properties: "aosp_jar:True"
@@ -114,6 +130,7 @@
builders {
name: "d8-linux-android-4.0.4"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
properties: "dex_vm:4.0.4"
@@ -122,6 +139,7 @@
builders {
name: "d8-linux-android-4.0.4_release"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
properties: "dex_vm:4.0.4"
@@ -130,6 +148,7 @@
builders {
name: "d8-linux-android-4.4.4"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
properties: "dex_vm:4.4.4"
@@ -138,6 +157,7 @@
builders {
name: "d8-linux-android-4.4.4_release"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
properties: "dex_vm:4.4.4"
@@ -146,6 +166,7 @@
builders {
name: "d8-linux-android-5.1.1"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
properties: "dex_vm:5.1.1"
@@ -154,6 +175,7 @@
builders {
name: "d8-linux-android-5.1.1_release"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
properties: "dex_vm:5.1.1"
@@ -162,6 +184,7 @@
builders {
name: "d8-linux-android-6.0.1"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
properties: "dex_vm:6.0.1"
@@ -170,6 +193,7 @@
builders {
name: "d8-linux-android-6.0.1_release"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
properties: "dex_vm:6.0.1"
@@ -178,6 +202,7 @@
builders {
name: "d8-linux-android-7.0.0"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
properties: "dex_vm:7.0.0"
@@ -186,6 +211,7 @@
builders {
name: "d8-linux-android-7.0.0_release"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
properties: "dex_vm:7.0.0"
@@ -194,7 +220,7 @@
builders {
name: "d8-linux-jctf"
mixins: "linux"
- dimensions: "jctf:true"
+ mixins: "jctf"
execution_timeout_secs: 43200 # 12h
recipe {
properties: "tool:d8"
@@ -205,6 +231,7 @@
builders {
name: "d8-linux-jctf_release"
mixins: "linux"
+ mixins: "jctf"
dimensions: "jctf:true"
execution_timeout_secs: 43200 # 12h
recipe {
@@ -216,6 +243,7 @@
builders {
name: "d8-linux_release"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:d8"
}
@@ -223,12 +251,14 @@
builders {
name: "linux"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:r8"
}
}
builders {
name: "linux_release"
+ mixins: "normal"
mixins: "linux"
recipe {
properties: "tool:r8"
@@ -237,6 +267,7 @@
builders {
name: "linux-android-4.0.4"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:r8"
properties: "dex_vm:4.0.4"
@@ -245,6 +276,7 @@
builders {
name: "linux-android-4.0.4_release"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:r8"
properties: "dex_vm:4.0.4"
@@ -253,6 +285,7 @@
builders {
name: "linux-android-4.4.4"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:r8"
properties: "dex_vm:4.4.4"
@@ -261,6 +294,7 @@
builders {
name: "linux-android-4.4.4_release"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:r8"
properties: "dex_vm:4.4.4"
@@ -268,6 +302,7 @@
}
builders {
name: "linux-android-5.1.1"
+ mixins: "normal"
mixins: "linux"
recipe {
properties: "tool:r8"
@@ -277,6 +312,7 @@
builders {
name: "linux-android-5.1.1_release"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:r8"
properties: "dex_vm:5.1.1"
@@ -285,6 +321,7 @@
builders {
name: "linux-android-6.0.1"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:r8"
properties: "dex_vm:6.0.1"
@@ -293,6 +330,7 @@
builders {
name: "linux-android-6.0.1_release"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:r8"
properties: "dex_vm:6.0.1"
@@ -301,6 +339,7 @@
builders {
name: "linux-android-7.0.0"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:r8"
properties: "dex_vm:7.0.0"
@@ -309,6 +348,7 @@
builders {
name: "linux-android-7.0.0_release"
mixins: "linux"
+ mixins: "normal"
recipe {
properties: "tool:r8"
properties: "dex_vm:7.0.0"
@@ -317,6 +357,7 @@
builders {
name: "linux-internal"
mixins: "linux"
+ mixins: "internal"
recipe {
properties: "internal:True"
}
@@ -324,6 +365,7 @@
builders {
name: "linux-internal_release"
mixins: "linux"
+ mixins: "internal"
recipe {
properties: "internal:True"
}
@@ -331,7 +373,7 @@
builders {
name: "linux-jctf"
mixins: "linux"
- dimensions: "jctf:true"
+ mixins: "jctf"
execution_timeout_secs: 43200 # 12h
recipe {
properties: "tool:r8"
@@ -342,7 +384,7 @@
builders {
name: "linux-jctf_release"
mixins: "linux"
- dimensions: "jctf:true"
+ mixins: "jctf"
execution_timeout_secs: 43200 # 12h
recipe {
properties: "tool:r8"
@@ -353,7 +395,7 @@
builders {
name: "r8cf-linux-jctf"
mixins: "linux"
- dimensions: "jctf:true"
+ mixins: "jctf"
execution_timeout_secs: 43200 # 12h
recipe {
properties: "tool:r8cf"
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 4de5097..f7e4493 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -76,6 +76,7 @@
acl_sets: "default"
triggering_policy: {
max_concurrent_invocations: 3
+ max_batch_size: 1
}
buildbucket {
server: "cr-buildbucket.appspot.com"
@@ -87,6 +88,9 @@
job {
id: "archive_release"
acl_sets: "default"
+ triggering_policy: {
+ max_batch_size: 1
+ }
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.r8.ci"
@@ -97,6 +101,9 @@
job {
id: "d8-linux"
acl_sets: "default"
+ triggering_policy: {
+ max_concurrent_invocations: 2
+ }
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.r8.ci"
@@ -147,6 +154,9 @@
job {
id: "d8-linux-android-5.1.1"
acl_sets: "default"
+ triggering_policy: {
+ max_concurrent_invocations: 2
+ }
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.r8.ci"
@@ -237,6 +247,9 @@
job {
id: "linux"
acl_sets: "default"
+ triggering_policy: {
+ max_concurrent_invocations: 2
+ }
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.r8.ci"
@@ -247,6 +260,9 @@
job {
id: "linux-android-4.0.4"
acl_sets: "default"
+ triggering_policy: {
+ max_concurrent_invocations: 2
+ }
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.r8.ci"
