Fix categories and windows dimension
Bug: 193100371
Change-Id: I1c2f8beaf0272c90a2a86c5040f08cae8337ce6c
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 5e6baae..d91527f 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -929,7 +929,7 @@
}
}
builders {
- name: "linux-kotlin-dev"
+ name: "linux-kotlin_dev"
swarming_host: "chrome-swarming.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
@@ -1119,7 +1119,7 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
- dimensions: "os:windows-10"
+ dimensions: "os:Windows-10"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
@@ -1144,7 +1144,7 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
- dimensions: "os:windows-10"
+ dimensions: "os:Windows-10"
dimensions: "pool:luci.r8.ci"
recipe {
name: "rex"
diff --git a/infra/config/global/generated/luci-milo.cfg b/infra/config/global/generated/luci-milo.cfg
index aa65735..45d3b0d 100644
--- a/infra/config/global/generated/luci-milo.cfg
+++ b/infra/config/global/generated/luci-milo.cfg
@@ -167,12 +167,12 @@
}
builders {
name: "buildbucket/luci.r8.ci/windows"
- category: "windows"
+ category: "R8"
short_name: "windows"
}
builders {
name: "buildbucket/luci.r8.ci/windows_release"
- category: "windows"
+ category: "R8 release"
short_name: "windows"
}
builders {
@@ -206,28 +206,28 @@
short_name: "jdk11_head"
}
builders {
- name: "buildbucket/luci.r8.ci/linux-kotlin-dev"
+ name: "buildbucket/luci.r8.ci/linux-kotlin_dev"
category: "R8"
- short_name: "dev"
+ short_name: "kotlin_dev"
}
builders {
name: "buildbucket/luci.r8.ci/linux-d8_jctf"
- category: "R8"
+ category: "jctf"
short_name: "d8_jctf"
}
builders {
name: "buildbucket/luci.r8.ci/linux-r8cf_jctf"
- category: "R8"
+ category: "jctf"
short_name: "r8cf_jctf"
}
builders {
name: "buildbucket/luci.r8.ci/linux-d8_jctf_release"
- category: "R8 release"
+ category: "jctf_release"
short_name: "d8_jctf"
}
builders {
name: "buildbucket/luci.r8.ci/linux-r8cf_jctf_release"
- category: "R8 release"
+ category: "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 cfc116a..c6af3c9 100644
--- a/infra/config/global/generated/luci-notify.cfg
+++ b/infra/config/global/generated/luci-notify.cfg
@@ -420,7 +420,7 @@
}
builders {
bucket: "ci"
- name: "linux-kotlin-dev"
+ name: "linux-kotlin_dev"
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 503d913..7d26059 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -380,13 +380,13 @@
}
}
job {
- id: "linux-kotlin-dev"
+ id: "linux-kotlin_dev"
realm: "ci"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.r8.ci"
- builder: "linux-kotlin-dev"
+ builder: "linux-kotlin_dev"
}
}
job {
@@ -521,7 +521,7 @@
triggers: "linux-jdk11"
triggers: "linux-jdk8"
triggers: "linux-jdk9"
- triggers: "linux-kotlin-dev"
+ triggers: "linux-kotlin_dev"
triggers: "linux-none"
triggers: "linux-r8cf_jctf"
triggers: "linux-run-on-app-dump"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 935654f..29f70b1 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -153,7 +153,7 @@
"pool" : "luci.r8.ci"
}
if windows:
- dimensions["os"] = "windows-10"
+ dimensions["os"] = "Windows-10"
else:
dimensions["os"] = "Ubuntu-16.04"
if jctf:
@@ -260,7 +260,7 @@
r8_tester_with_default("linux-android-12.0.0",
["--dex_vm=12.0.0", "--all_tests"])
-r8_tester_with_default("windows", ["--all_tests"], category = "windows",
+r8_tester_with_default("windows", ["--all_tests"],
dimensions=get_dimensions(windows=True))
def internal():
@@ -321,7 +321,7 @@
desugared_library()
r8_builder(
- "linux-kotlin-dev",
+ "linux-kotlin_dev",
dimensions = get_dimensions(),
execution_timeout = time.hour * 12,
expiration_timeout = time.hour * 35,
@@ -344,6 +344,7 @@
name = name + release
r8_builder(
name,
+ category = "jctf" + release,
dimensions = get_dimensions(jctf=True),
execution_timeout = time.hour * 12,
expiration_timeout = time.hour * 35,
