Use shorter names that are obvious from the categories
Bug: 193100371
Change-Id: I38234c3f752bc6ba8df26c21b49484a31b05c834
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 15a9c0c..3257a36 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -44,32 +44,6 @@
}
}
builders {
- name: "archive_lib_desugar"
- 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"
- 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\""
- properties_j: "builder_group:\"internal.client.r8\""
- properties_j: "sdk_desugar:\"true\""
- }
- 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.use_realms"
- value: 0
- }
- }
- builders {
name: "archive_release"
swarming_host: "chrome-swarming.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
@@ -95,7 +69,7 @@
}
}
builders {
- name: "desugared_library_head"
+ name: "desugared_library-head"
swarming_host: "chrome-swarming.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
@@ -120,7 +94,7 @@
}
}
builders {
- name: "desugared_library_jdk11_head"
+ name: "desugared_library-jdk11_head"
swarming_host: "chrome-swarming.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
@@ -145,6 +119,32 @@
}
}
builders {
+ name: "lib_desugar-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"
+ 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\""
+ properties_j: "builder_group:\"internal.client.r8\""
+ properties_j: "sdk_desugar:\"true\""
+ }
+ 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.use_realms"
+ value: 0
+ }
+ }
+ builders {
name: "linux-android-10.0.0"
swarming_host: "chrome-swarming.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
diff --git a/infra/config/global/generated/luci-milo.cfg b/infra/config/global/generated/luci-milo.cfg
index 2ab674a..aa65735 100644
--- a/infra/config/global/generated/luci-milo.cfg
+++ b/infra/config/global/generated/luci-milo.cfg
@@ -17,13 +17,13 @@
}
builders {
name: "buildbucket/luci.r8.ci/archive_release"
- category: "archive"
- short_name: "archive_release"
+ category: "archive_release"
+ short_name: "archive"
}
builders {
- name: "buildbucket/luci.r8.ci/archive_lib_desugar"
+ name: "buildbucket/luci.r8.ci/lib_desugar-archive"
category: "library_desugar"
- short_name: "archive_lib_desugar"
+ short_name: "archive"
}
builders {
name: "buildbucket/luci.r8.ci/linux-dex_default"
@@ -33,7 +33,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-dex_default_release"
category: "R8 release"
- short_name: "dex_default_release"
+ short_name: "dex_default"
}
builders {
name: "buildbucket/luci.r8.ci/linux-none"
@@ -43,7 +43,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-none_release"
category: "R8 release"
- short_name: "none_release"
+ short_name: "none"
}
builders {
name: "buildbucket/luci.r8.ci/linux-jdk8"
@@ -53,7 +53,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-jdk8_release"
category: "R8 release"
- short_name: "jdk8_release"
+ short_name: "jdk8"
}
builders {
name: "buildbucket/luci.r8.ci/linux-jdk9"
@@ -63,7 +63,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-jdk9_release"
category: "R8 release"
- short_name: "jdk9_release"
+ short_name: "jdk9"
}
builders {
name: "buildbucket/luci.r8.ci/linux-jdk11"
@@ -73,7 +73,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-jdk11_release"
category: "R8 release"
- short_name: "jdk11_release"
+ short_name: "jdk11"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-4.0.4"
@@ -83,7 +83,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-4.0.4_release"
category: "R8 release"
- short_name: "4.0.4_release"
+ short_name: "4.0.4"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-4.4.4"
@@ -93,7 +93,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-4.4.4_release"
category: "R8 release"
- short_name: "4.4.4_release"
+ short_name: "4.4.4"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-5.1.1"
@@ -103,7 +103,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-5.1.1_release"
category: "R8 release"
- short_name: "5.1.1_release"
+ short_name: "5.1.1"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-6.0.1"
@@ -113,7 +113,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-6.0.1_release"
category: "R8 release"
- short_name: "6.0.1_release"
+ short_name: "6.0.1"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-7.0.0"
@@ -123,7 +123,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-7.0.0_release"
category: "R8 release"
- short_name: "7.0.0_release"
+ short_name: "7.0.0"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-8.1.0"
@@ -133,7 +133,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-8.1.0_release"
category: "R8 release"
- short_name: "8.1.0_release"
+ short_name: "8.1.0"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-9.0.0"
@@ -143,7 +143,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-9.0.0_release"
category: "R8 release"
- short_name: "9.0.0_release"
+ short_name: "9.0.0"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-10.0.0"
@@ -153,7 +153,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-10.0.0_release"
category: "R8 release"
- short_name: "10.0.0_release"
+ short_name: "10.0.0"
}
builders {
name: "buildbucket/luci.r8.ci/linux-android-12.0.0"
@@ -163,7 +163,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-android-12.0.0_release"
category: "R8 release"
- short_name: "12.0.0_release"
+ short_name: "12.0.0"
}
builders {
name: "buildbucket/luci.r8.ci/windows"
@@ -173,7 +173,7 @@
builders {
name: "buildbucket/luci.r8.ci/windows_release"
category: "windows"
- short_name: "windows_release"
+ short_name: "windows"
}
builders {
name: "buildbucket/luci.r8.ci/linux-internal"
@@ -183,7 +183,7 @@
builders {
name: "buildbucket/luci.r8.ci/linux-internal_release"
category: "R8 release"
- short_name: "internal_release"
+ short_name: "internal"
}
builders {
name: "buildbucket/luci.r8.ci/linux-run-on-app-dump"
@@ -193,17 +193,17 @@
builders {
name: "buildbucket/luci.r8.ci/linux-run-on-app-dump_release"
category: "R8 release"
- short_name: "dump_release"
+ short_name: "dump"
}
builders {
- name: "buildbucket/luci.r8.ci/desugared_library_head"
+ name: "buildbucket/luci.r8.ci/desugared_library-head"
category: "library_desugar"
- short_name: "desugared_library_head"
+ short_name: "head"
}
builders {
- name: "buildbucket/luci.r8.ci/desugared_library_jdk11_head"
+ name: "buildbucket/luci.r8.ci/desugared_library-jdk11_head"
category: "library_desugar"
- short_name: "desugared_library_jdk11_head"
+ short_name: "jdk11_head"
}
builders {
name: "buildbucket/luci.r8.ci/linux-kotlin-dev"
@@ -223,11 +223,11 @@
builders {
name: "buildbucket/luci.r8.ci/linux-d8_jctf_release"
category: "R8 release"
- short_name: "d8_jctf_release"
+ short_name: "d8_jctf"
}
builders {
name: "buildbucket/luci.r8.ci/linux-r8cf_jctf_release"
category: "R8 release"
- short_name: "r8cf_jctf_release"
+ short_name: "r8cf_jctf"
}
}
diff --git a/infra/config/global/generated/luci-notify.cfg b/infra/config/global/generated/luci-notify.cfg
index 564cb92..cfc116a 100644
--- a/infra/config/global/generated/luci-notify.cfg
+++ b/infra/config/global/generated/luci-notify.cfg
@@ -36,7 +36,7 @@
}
builders {
bucket: "ci"
- name: "desugared_library_head"
+ name: "desugared_library-head"
repository: "https://r8.googlesource.com/r8"
}
}
@@ -48,7 +48,7 @@
}
builders {
bucket: "ci"
- name: "desugared_library_jdk11_head"
+ name: "desugared_library-jdk11_head"
repository: "https://r8.googlesource.com/r8"
}
}
diff --git a/infra/config/global/generated/luci-scheduler.cfg b/infra/config/global/generated/luci-scheduler.cfg
index 7a816ee..503d913 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -20,21 +20,6 @@
}
}
job {
- id: "archive_lib_desugar"
- 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: "luci.r8.ci"
- builder: "archive_lib_desugar"
- }
-}
-job {
id: "archive_release"
realm: "ci"
acl_sets: "ci"
@@ -50,23 +35,38 @@
}
}
job {
- id: "desugared_library_head"
+ id: "desugared_library-head"
realm: "ci"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.r8.ci"
- builder: "desugared_library_head"
+ builder: "desugared_library-head"
}
}
job {
- id: "desugared_library_jdk11_head"
+ id: "desugared_library-jdk11_head"
realm: "ci"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.r8.ci"
- builder: "desugared_library_jdk11_head"
+ builder: "desugared_library-jdk11_head"
+ }
+}
+job {
+ id: "lib_desugar-archive"
+ 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: "luci.r8.ci"
+ builder: "lib_desugar-archive"
}
}
job {
@@ -504,8 +504,8 @@
realm: "ci"
acl_sets: "ci"
triggers: "archive"
- triggers: "desugared_library_head"
- triggers: "desugared_library_jdk11_head"
+ triggers: "desugared_library-head"
+ triggers: "desugared_library-jdk11_head"
triggers: "linux-android-10.0.0"
triggers: "linux-android-12.0.0"
triggers: "linux-android-4.0.4"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 7d702ee..0c624fb 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -184,7 +184,7 @@
**kwargs
)
category = category if category else "R8 release" if release else "R8"
- builder_view(name, category, name.split("-")[-1])
+ builder_view(name, category, name.split("-")[-1].replace("_release", ""))
def r8_tester(name,
test_options,
@@ -211,7 +211,7 @@
dimensions = dimensions, category = category)
def archivers():
- for name in ["archive", "archive_release", "archive_lib_desugar"]:
+ for name in ["archive", "archive_release", "lib_desugar-archive"]:
desugar = "desugar" in name
properties = {
"archive": "true",
@@ -219,10 +219,9 @@
}
if desugar:
properties["sdk_desugar"] = "true"
- category = "library_desugar" if desugar else name
r8_builder(
name,
- category = "library_desugar" if desugar else 'archive',
+ category = "library_desugar" if desugar else name,
dimensions = get_dimensions(),
triggering_policy = scheduler.policy(
kind = scheduler.GREEDY_BATCHING_KIND,
@@ -311,7 +310,7 @@
"builder_group" : "internal.client.r8",
"test_options" : test_options,
}
- name = "desugared_library_" + name
+ name = "desugared_library-" + name
r8_builder(
name,
category = "library_desugar",
