Fixes for infra config generation
Use right service account
Add swarming tags for all builers
Add build numbers
Add builder_group
Add priority and normal property for normal builders
Refactor into R8 builder
Bug: 193100371
Change-Id: I08e27676c1b4aeacf2b71a5973ce8505e1e17f6e
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index b8a3edb..26191a1 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -11,7 +11,7 @@
}
acls {
role: SCHEDULER
- group: "luci-scheduler@appspot.gserviceaccount.com"
+ identity: "user:luci-scheduler@appspot.gserviceaccount.com"
}
acls {
role: SCHEDULER
@@ -21,6 +21,7 @@
builders {
name: "archive"
swarming_host: "chrome-swarming.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-16.04"
@@ -29,28 +30,18 @@
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
- properties_j: "archive:true"
+ properties_j: "archive:\"true\""
+ properties_j: "builder_group:\"internal.client.r8\""
}
+ priority: 25
execution_timeout_secs: 1800
+ expiration_secs: 126000
+ build_numbers: YES
+ service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
name: "archive_release"
swarming_host: "chrome-swarming.appspot.com"
- dimensions: "cores:8"
- dimensions: "cpu:x86-64"
- dimensions: "os:Ubuntu-16.04"
- dimensions: "pool:luci.r8.ci"
- recipe {
- name: "rex"
- cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
- cipd_version: "refs/heads/master"
- properties_j: "archive:true"
- }
- execution_timeout_secs: 1800
- }
- builders {
- name: "linux-android-4.0.4"
- swarming_host: "chrome-swarming.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
@@ -60,10 +51,35 @@
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "archive:\"true\""
+ properties_j: "builder_group:\"internal.client.r8\""
+ }
+ priority: 25
+ execution_timeout_secs: 1800
+ expiration_secs: 126000
+ build_numbers: YES
+ service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ }
+ builders {
+ name: "linux-android-4.0.4"
+ swarming_host: "chrome-swarming.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
+ dimensions: "os:Ubuntu-16.04"
+ dimensions: "pool:luci.r8.ci"
+ recipe {
+ name: "rex"
+ cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
+ cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=4.0.4\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -72,16 +88,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=4.0.4\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -90,16 +110,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=4.4.4\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -108,16 +132,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=4.4.4\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -126,16 +154,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=5.1.1\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -144,16 +176,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=5.1.1\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -162,16 +198,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=6.0.1\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -180,16 +220,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=6.0.1\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -198,16 +242,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=7.0.0\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -216,16 +264,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=7.0.0\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -234,16 +286,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=10.0.0\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -252,16 +308,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=10.0.0\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -270,16 +330,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=8.1.0\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -288,16 +352,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=8.1.0\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -306,16 +374,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=9.0.0\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -324,16 +396,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--dex_vm=9.0.0\",\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -342,16 +418,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=dex-default\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -360,16 +440,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=dex-default\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -378,16 +462,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=jdk11\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -396,16 +484,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=jdk11\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -414,16 +506,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=jdk11\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -432,16 +528,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=jdk11\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -450,16 +550,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=jdk8\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -468,16 +572,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=jdk8\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -486,16 +594,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=jdk9\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -504,16 +616,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=jdk9\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -522,16 +638,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=none\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -540,16 +660,20 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "normal:true"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--runtimes=none\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -564,10 +688,13 @@
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
builders {
@@ -582,10 +709,13 @@
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
+ properties_j: "builder_group:\"internal.client.r8\""
properties_j: "test_options:[\"--all_tests\",\"--tool=r8\",\"--no_internal\",\"--one_line_per_test\",\"--archive_failures\"]"
}
+ priority: 26
execution_timeout_secs: 21600
expiration_secs: 126000
+ build_numbers: YES
service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
}
diff --git a/infra/config/global/generated/luci-milo.cfg b/infra/config/global/generated/luci-milo.cfg
index 3202e40..c14aa89 100644
--- a/infra/config/global/generated/luci-milo.cfg
+++ b/infra/config/global/generated/luci-milo.cfg
@@ -17,7 +17,7 @@
}
builders {
name: "buildbucket/luci.r8.ci/archive_release"
- category: "R8"
+ category: "R8 release"
short_name: "archive_release"
}
builders {
@@ -28,7 +28,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-dex_default_release"
category: "R8 release"
- short_name: "dex_default"
+ short_name: "dex_default_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-none"
@@ -38,7 +38,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-none_release"
category: "R8 release"
- short_name: "none"
+ short_name: "none_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-jdk8"
@@ -48,7 +48,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-jdk8_release"
category: "R8 release"
- short_name: "jdk8"
+ short_name: "jdk8_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-jdk9"
@@ -58,7 +58,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-jdk9_release"
category: "R8 release"
- short_name: "jdk9"
+ short_name: "jdk9_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-jdk11"
@@ -68,7 +68,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-jdk11_release"
category: "R8 release"
- short_name: "jdk11"
+ short_name: "jdk11_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-internal"
@@ -78,7 +78,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-internal_release"
category: "R8 release"
- short_name: "internal"
+ short_name: "internal_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-4.0.4"
@@ -88,7 +88,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-4.0.4_release"
category: "R8 release"
- short_name: "4.0.4"
+ short_name: "4.0.4_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-4.4.4"
@@ -98,7 +98,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-4.4.4_release"
category: "R8 release"
- short_name: "4.4.4"
+ short_name: "4.4.4_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-5.1.1"
@@ -108,7 +108,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-5.1.1_release"
category: "R8 release"
- short_name: "5.1.1"
+ short_name: "5.1.1_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-6.0.1"
@@ -118,7 +118,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-6.0.1_release"
category: "R8 release"
- short_name: "6.0.1"
+ short_name: "6.0.1_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-7.0.0"
@@ -128,7 +128,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-7.0.0_release"
category: "R8 release"
- short_name: "7.0.0"
+ short_name: "7.0.0_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android=8.1.0"
@@ -138,7 +138,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android=8.1.0_release"
category: "R8 release"
- short_name: "android=8.1.0"
+ short_name: "android=8.1.0_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android=9.0.0"
@@ -148,7 +148,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android=9.0.0_release"
category: "R8 release"
- short_name: "android=9.0.0"
+ short_name: "android=9.0.0_release"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android=10.0.0"
@@ -158,7 +158,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android=10.0.0_release"
category: "R8 release"
- short_name: "android=10.0.0"
+ short_name: "android=10.0.0_release"
}
builders {
name: "buildbucket/luci.r8.ci/windows"
@@ -168,6 +168,6 @@
builders {
name: "buildbucket/luci.r8.ci/windows_release"
category: "R8 release"
- short_name: "windows"
+ short_name: "windows_release"
}
}
diff --git a/infra/config/global/generated/luci-notify.cfg b/infra/config/global/generated/luci-notify.cfg
index 24a7816..5267938 100644
--- a/infra/config/global/generated/luci-notify.cfg
+++ b/infra/config/global/generated/luci-notify.cfg
@@ -12,6 +12,30 @@
}
builders {
bucket: "ci"
+ name: "archive"
+ repository: "https://r8.googlesource.com/r8"
+ }
+}
+notifiers {
+ notifications {
+ on_failure: true
+ on_new_failure: true
+ notify_blamelist {}
+ }
+ builders {
+ bucket: "ci"
+ name: "archive_release"
+ repository: "https://r8.googlesource.com/r8"
+ }
+}
+notifiers {
+ notifications {
+ on_failure: true
+ on_new_failure: true
+ notify_blamelist {}
+ }
+ builders {
+ bucket: "ci"
name: "linux-android-4.0.4"
repository: "https://r8.googlesource.com/r8"
}
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index cdadb61..58cfe5a 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -23,9 +23,11 @@
acl.BUILDBUCKET_TRIGGERER,
],
groups = [
- "luci-scheduler@appspot.gserviceaccount.com",
"project-r8-committers"
- ],
+ ],
+ users = [
+ "luci-scheduler@appspot.gserviceaccount.com"
+ ]
),
]
@@ -87,7 +89,7 @@
"--archive_failures"
]
-def get_dimensions(windows=False, jctf=False, internal=False):
+def get_dimensions(windows=False, jctf=False, internal=False, normal=False):
dimensions = {
"cores" : "2" if internal else "8",
"cpu" : "x86-64",
@@ -101,84 +103,72 @@
dimensions["jctf"] = "true"
if internal:
dimensions["internal"] = "true"
+ if normal:
+ dimensions["normal"] = "true"
return dimensions
+def r8_builder(name, priority=26, **kwargs):
+ release = name.endswith("release")
+ triggered = ["branch-gitiles-trigger"] if release \
+ else ["main-gitiles-trigger"]
+
+ luci.builder(
+ name = name,
+ bucket = "ci",
+ service_account = "r8-ci-builder@chops-service-accounts." +
+ "iam.gserviceaccount.com",
+ build_numbers = True,
+ swarming_tags = ["vpython:native-python-wrapper"],
+ notifies = ["r8-failures"],
+ priority = priority,
+ triggered_by = triggered,
+ executable = "rex",
+ **kwargs
+ )
+ category = "R8 release" if release else "R8"
+ builder_view(name, category, name.split("-")[-1])
+
def r8_tester(name,
test_options,
dimensions=None,
execution_timeout=time.hour * 6,
expiration_timeout=time.hour * 35):
- dimensions = dimensions if dimensions else get_dimensions()
- luci.builder(
- name = name,
- bucket = "ci",
- service_account = "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
- swarming_tags = ["vpython:native-python-wrapper"],
- execution_timeout=execution_timeout,
- expiration_timeout=expiration_timeout,
- executable = "rex",
- dimensions = dimensions,
- triggered_by = ["main-gitiles-trigger"],
- properties = {
- "test_options" : test_options
- },
- notifies = ["r8-failures"]
- )
- builder_view(name, "R8", name.split("-")[-1])
-
- # Branch version
- release_name = name + "_release"
- luci.builder(
- name = release_name,
- bucket = "ci",
- service_account = "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
- swarming_tags = ["vpython:native-python-wrapper"],
- execution_timeout=execution_timeout,
- expiration_timeout=expiration_timeout,
- executable = "rex",
- dimensions = dimensions,
- triggered_by = ["branch-gitiles-trigger"],
- properties = {
- "test_options" : test_options
- },
- notifies = ["r8-failures"]
- )
- builder_view(release_name, "R8 release", name.split("-")[-1])
+ dimensions = dimensions if dimensions else get_dimensions(normal=True)
+ for name in [name, name + "_release"]:
+ r8_builder(
+ name = name,
+ execution_timeout=execution_timeout,
+ expiration_timeout=expiration_timeout,
+ dimensions = dimensions,
+ properties = {
+ "test_options" : test_options,
+ "builder_group" : "internal.client.r8"
+ },
+ )
def r8_tester_with_default(name, test_options, dimensions=None):
r8_tester(name, test_options + common_test_options, dimensions)
-luci.builder(
- name = "archive",
- bucket = "ci",
- dimensions = get_dimensions(),
- triggered_by = ["main-gitiles-trigger"],
- executable = "rex",
- execution_timeout = time.minute * 30,
- triggering_policy = scheduler.policy(
- kind = scheduler.GREEDY_BATCHING_KIND,
- max_batch_size = 1,
- max_concurrent_invocations = 3
- ),
- properties = {"archive": True}
-)
-builder_view("archive", "R8", "archive")
-luci.builder(
- name = "archive_release",
- bucket = "ci",
- dimensions = get_dimensions(),
- triggered_by = ["branch-gitiles-trigger"],
- execution_timeout = time.minute * 30,
- executable = "rex",
- triggering_policy = scheduler.policy(
- kind = scheduler.GREEDY_BATCHING_KIND,
- max_batch_size = 1,
- max_concurrent_invocations = 3
- ),
- properties = {"archive": True}
-)
-builder_view("archive_release", "R8", "archive_release")
+def archivers():
+ for name in ["archive", "archive_release"]:
+ r8_builder(
+ name,
+ dimensions = get_dimensions(),
+ triggering_policy = scheduler.policy(
+ kind = scheduler.GREEDY_BATCHING_KIND,
+ max_batch_size = 1,
+ max_concurrent_invocations = 3
+ ),
+ priority = 25,
+ properties = {
+ "archive": "true",
+ "builder_group" : "internal.client.r8"
+ },
+ execution_timeout = time.minute * 30,
+ expiration_timeout = time.hour * 35,
+ )
+archivers()
r8_tester_with_default("linux-dex_default", ["--runtimes=dex-default"])
r8_tester_with_default("linux-none", ["--runtimes=none"])
