Add builder for JDK-11 based desugared library
Bug: b/222647019
Change-Id: I78620d8ebda4ba33dc3b3cdd0b5a524385afdabd
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 0586776..ebe76f2 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -168,7 +168,41 @@
' "builder_group": "internal.client.r8",'
' "recipe": "rex",'
' "test_options": ['
- ' "--variant=jdk11"'
+ ' "--variant=jdk11_minimal",'
+ ' "--variant=jdk11",'
+ ' "--variant=jdk11_nio"'
+ ' ],'
+ ' "test_wrapper": "tools/archive_desugar_jdk_libs.py"'
+ '}'
+ priority: 25
+ execution_timeout_secs: 3600
+ expiration_secs: 126000
+ build_numbers: YES
+ service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ }
+ builders {
+ name: "lib_desugar-archive-jdk11-legacy"
+ swarming_host: "chrome-swarming.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Ubuntu-16.04"
+ dimensions: "pool:luci.r8.ci"
+ exe {
+ cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
+ cipd_version: "refs/heads/master"
+ cmd: "luciexe"
+ }
+ properties:
+ '{'
+ ' "builder_group": "internal.client.r8",'
+ ' "recipe": "rex",'
+ ' "test_options": ['
+ ' "--variant=jdk11_legacy"'
' ],'
' "test_wrapper": "tools/archive_desugar_jdk_libs.py"'
'}'
diff --git a/infra/config/global/generated/luci-milo.cfg b/infra/config/global/generated/luci-milo.cfg
index 9aaa005..c550e41 100644
--- a/infra/config/global/generated/luci-milo.cfg
+++ b/infra/config/global/generated/luci-milo.cfg
@@ -126,6 +126,11 @@
short_name: "jdk11"
}
builders {
+ name: "buildbucket/luci.r8.ci/lib_desugar-archive-jdk11-legacy"
+ category: "library_desugar"
+ short_name: "legacy"
+ }
+ builders {
name: "buildbucket/luci.r8.ci/lib_desugar-archive-jdk8"
category: "library_desugar"
short_name: "jdk8"
diff --git a/infra/config/global/generated/luci-scheduler.cfg b/infra/config/global/generated/luci-scheduler.cfg
index 10dd059..b775cde 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -78,6 +78,21 @@
}
}
job {
+ id: "lib_desugar-archive-jdk11-legacy"
+ realm: "ci"
+ acl_sets: "ci"
+ triggering_policy {
+ kind: GREEDY_BATCHING
+ max_concurrent_invocations: 3
+ max_batch_size: 1
+ }
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
+ builder: "lib_desugar-archive-jdk11-legacy"
+ }
+}
+job {
id: "lib_desugar-archive-jdk8"
realm: "ci"
acl_sets: "ci"
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index 53f90a7..bb18107 100644
--- a/infra/config/global/generated/project.cfg
+++ b/infra/config/global/generated/project.cfg
@@ -7,7 +7,7 @@
name: "r8"
access: "group:all"
lucicfg {
- version: "1.30.11"
+ version: "1.32.1"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index f93a678..73e0802 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -240,14 +240,24 @@
dimensions = dimensions, category = category, release_trigger=release_trigger)
def archivers():
- for name in ["archive", "archive_release", "lib_desugar-archive-jdk11", "lib_desugar-archive-jdk8"]:
+ for name in [
+ "archive",
+ "archive_release",
+ "lib_desugar-archive-jdk11",
+ "lib_desugar-archive-jdk11-legacy",
+ "lib_desugar-archive-jdk8"]:
desugar = "desugar" in name
properties = {
"test_wrapper" : "tools/archive_desugar_jdk_libs.py" if desugar else "tools/archive.py",
"builder_group" : "internal.client.r8"
}
if desugar:
- properties["test_options"] = ["--variant=jdk11" if "jdk11" in name else "--variant=jdk8"]
+ if name.endswith("jdk11"):
+ properties["test_options"] = ["--variant=jdk11_minimal", "--variant=jdk11", "--variant=jdk11_nio"]
+ elif name.endswith("jdk11-legacy"):
+ properties["test_options"] = ["--variant=jdk11_legacy"]
+ else:
+ properties["test_options"] = ["--variant=jdk8"]
r8_builder(
name,
