Remove repeated test runs
We currently run all tests on the d8 bots, this changes that to only run the art tests
In addition, this changes our jctf running to be (d8 and r8) and r8cf
Change-Id: I2d57d146fcbc8f95223fc29c750f74e437e07444
diff --git a/build.gradle b/build.gradle
index a38fd63..f492319 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1597,18 +1597,17 @@
if (project.hasProperty('tool')) {
if (project.property('tool') == 'r8') {
exclude "com/android/tools/r8/art/*/d8/**"
- exclude "com/android/tools/r8/jctf/d8/**"
- exclude "com/android/tools/r8/jctf/r8cf/**"
+ exclude "com/android/tools/r8/jctf/**"
} else if (project.property('tool') == 'd8') {
- exclude "com/android/tools/r8/art/*/r8/**"
- exclude "com/android/tools/r8/jctf/r8/**"
- exclude "com/android/tools/r8/jctf/r8cf/**"
+ if (project.hasProperty('only_jctf')) {
+ include "com/android/tools/r8/jctf/d8/**"
+ } else {
+ include "com/android/tools/r8/art/*/d8/**"
+ }
} else {
assert(project.property('tool') == 'r8cf')
- exclude "com/android/tools/r8/art/*/d8/**"
- exclude "com/android/tools/r8/art/*/r8/**"
- exclude "com/android/tools/r8/jctf/d8/**"
- exclude "com/android/tools/r8/jctf/r8/**"
+ assert(project.hasProperty('only_jctf'))
+ include "com/android/tools/r8/jctf/r8cf/**"
}
}
if (!project.hasProperty('all_tests')) {
@@ -1617,9 +1616,6 @@
if (!project.hasProperty('jctf') && !project.hasProperty('only_jctf')) {
exclude "com/android/tools/r8/jctf/**"
}
- if (project.hasProperty('only_jctf')) {
- include "com/android/tools/r8/jctf/**"
- }
if (project.hasProperty('shard_count') ) {
assert project.hasProperty('shard_number')
int shard_count = project.getProperty('shard_count') as Integer
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 1040635..0260b35 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -218,29 +218,6 @@
}
}
builders {
- name: "d8-linux-jctf"
- mixins: "linux"
- mixins: "jctf"
- execution_timeout_secs: 43200 # 12h
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:all"
- properties: "only_jctf:True"
- }
- }
- builders {
- name: "d8-linux-jctf_release"
- mixins: "linux"
- mixins: "jctf"
- dimensions: "jctf:true"
- execution_timeout_secs: 43200 # 12h
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:all"
- properties: "only_jctf:True"
- }
- }
- builders {
name: "d8-linux_release"
mixins: "linux"
mixins: "normal"
@@ -376,7 +353,7 @@
mixins: "jctf"
execution_timeout_secs: 43200 # 12h
recipe {
- properties: "tool:r8"
+ properties: "tool:d8"
properties: "dex_vm:all"
properties: "only_jctf:True"
}
@@ -387,7 +364,7 @@
mixins: "jctf"
execution_timeout_secs: 43200 # 12h
recipe {
- properties: "tool:r8"
+ properties: "tool:d8"
properties: "dex_vm:all"
properties: "only_jctf:True"
}
diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
index 8dc59cb..1a3ae77 100644
--- a/infra/config/global/luci-milo.cfg
+++ b/infra/config/global/luci-milo.cfg
@@ -87,11 +87,6 @@
short_name: "7.0.0"
}
builders {
- name: "buildbucket/luci.r8.ci/d8-linux-jctf"
- category: "D8"
- short_name: "jctf"
- }
- builders {
name: "buildbucket/luci.r8.ci/windows"
category: "win"
short_name: "win"
@@ -180,11 +175,6 @@
category: "D8"
short_name: "7.0.0"
}
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-jctf_release"
- category: "D8"
- short_name: "jctf"
- }
# TODO(ricow): Windows on the release branches currently do not work
# There is no java available.
# builders {
@@ -282,11 +272,6 @@
short_name: "7.0.0"
}
builders {
- name: "buildbucket/luci.r8.ci/d8-linux-jctf"
- category: "D8"
- short_name: "jctf"
- }
- builders {
name: "buildbucket/luci.r8.ci/windows"
category: "win"
short_name: "win"
@@ -366,9 +351,4 @@
category: "D8 release"
short_name: "7.0.0"
}
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-jctf_release"
- category: "D8 release"
- short_name: "jctf"
- }
}
diff --git a/infra/config/global/luci-notify.cfg b/infra/config/global/luci-notify.cfg
index c7f9ec7..bb27c81 100644
--- a/infra/config/global/luci-notify.cfg
+++ b/infra/config/global/luci-notify.cfg
@@ -83,16 +83,6 @@
repository: "https://r8.googlesource.com/r8"
}
builders {
- name: "d8-linux-jctf"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
- name: "d8-linux-jctf_release"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
name: "d8-linux_release"
bucket: "ci"
repository: "https://r8.googlesource.com/r8"
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index f7e4493..dca0298 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -31,7 +31,6 @@
triggers: "d8-linux-android-5.1.1"
triggers: "d8-linux-android-6.0.1"
triggers: "d8-linux-android-7.0.0"
- triggers: "d8-linux-jctf"
triggers: "linux"
triggers: "linux"
triggers: "linux-android-4.0.4"
@@ -58,7 +57,6 @@
triggers: "d8-linux-android-5.1.1_release"
triggers: "d8-linux-android-6.0.1_release"
triggers: "d8-linux-android-7.0.0_release"
- triggers: "d8-linux-jctf_release"
triggers: "d8-linux_release"
triggers: "linux-android-4.0.4_release"
triggers: "linux-android-4.4.4_release"
@@ -215,26 +213,6 @@
}
job {
- id: "d8-linux-jctf"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-jctf"
- }
-}
-
-job {
- id: "d8-linux-jctf_release"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-jctf_release"
- }
-}
-
-job {
id: "d8-linux_release"
acl_sets: "default"
buildbucket {
