Remove d8 bots on master
Also remove running on the aosp jar, we already have tracking of this trough our WIP bots
Keep the jars, since we have benchmarks.
The art tests will still be run on the r8 bots
Change-Id: I37f1ae741a139670348915364de8aab43554baaa
diff --git a/build.gradle b/build.gradle
index f492319..dc39550 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1475,14 +1475,6 @@
setConfiguration(configurations.supportLibs)
}
-task AospJarTest(type: Exec) {
- dependsOn CompatDx, downloadDeps
- def script = "tools/test_aosp_jar.py"
- inputs.files files(script)
- commandLine "python", script, "--no-build"
- workingDir = projectDir
-}
-
def getR8LibTask() {
if (project.hasProperty('r8lib')) {
return R8Lib
@@ -1596,13 +1588,14 @@
if (project.hasProperty('tool')) {
if (project.property('tool') == 'r8') {
- exclude "com/android/tools/r8/art/*/d8/**"
exclude "com/android/tools/r8/jctf/**"
} else if (project.property('tool') == 'd8') {
if (project.hasProperty('only_jctf')) {
include "com/android/tools/r8/jctf/d8/**"
} else {
- include "com/android/tools/r8/art/*/d8/**"
+ // Don't run anything, deprecated
+ println "Running with deprecated tool d8, not running any tests"
+ include ""
}
} else {
assert(project.property('tool') == 'r8cf')
@@ -1640,9 +1633,6 @@
if (project.hasProperty('test_dir')) {
systemProperty 'test_dir', project.property('test_dir')
}
- if (project.hasProperty('aosp_jar')) {
- dependsOn AospJarTest
- }
if (project.hasProperty('r8lib') || project.hasProperty('r8lib_no_deps')) {
dependsOn configureTestForR8Lib
// We remove build/classes/test from classpath and rely on configureTestForR8Lib to provide
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index a38e3bf..20047c1 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -124,26 +124,6 @@
}
builders {
- name: "d8-linux"
- mixins: "linux"
- mixins: "normal"
- mixins: "fast_bot"
- recipe {
- properties: "tool:d8"
- properties: "aosp_jar:True"
- }
- }
- builders {
- name: "d8-linux-android-4.0.4"
- mixins: "linux"
- mixins: "normal"
- mixins: "fast_bot"
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:4.0.4"
- }
- }
- builders {
name: "d8-linux-android-4.0.4_release"
mixins: "linux"
mixins: "normal"
@@ -153,16 +133,6 @@
}
}
builders {
- name: "d8-linux-android-4.4.4"
- mixins: "linux"
- mixins: "normal"
- mixins: "fast_bot"
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:4.4.4"
- }
- }
- builders {
name: "d8-linux-android-4.4.4_release"
mixins: "linux"
mixins: "normal"
@@ -172,16 +142,6 @@
}
}
builders {
- name: "d8-linux-android-5.1.1"
- mixins: "linux"
- mixins: "normal"
- mixins: "fast_bot"
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:5.1.1"
- }
- }
- builders {
name: "d8-linux-android-5.1.1_release"
mixins: "linux"
mixins: "normal"
@@ -191,16 +151,6 @@
}
}
builders {
- name: "d8-linux-android-6.0.1"
- mixins: "linux"
- mixins: "normal"
- mixins: "fast_bot"
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:6.0.1"
- }
- }
- builders {
name: "d8-linux-android-6.0.1_release"
mixins: "linux"
mixins: "normal"
@@ -210,16 +160,6 @@
}
}
builders {
- name: "d8-linux-android-7.0.0"
- mixins: "linux"
- mixins: "normal"
- mixins: "fast_bot"
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:7.0.0"
- }
- }
- builders {
name: "d8-linux-android-7.0.0_release"
mixins: "linux"
mixins: "normal"
diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
index 9f1897a..a830e6f 100644
--- a/infra/config/global/luci-milo.cfg
+++ b/infra/config/global/luci-milo.cfg
@@ -57,36 +57,6 @@
short_name: "cf-jctf"
}
builders {
- name: "buildbucket/luci.r8.ci/d8-linux"
- category: "D8"
- short_name: "linux"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-4.0.4"
- category: "D8"
- short_name: "4.0.4"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-4.4.4"
- category: "D8"
- short_name: "4.4.4"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-5.1.1"
- category: "D8"
- short_name: "5.1.1"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-6.0.1"
- category: "D8"
- short_name: "6.0.1"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-7.0.0"
- category: "D8"
- short_name: "7.0.0"
- }
- builders {
name: "buildbucket/luci.r8.ci/windows"
category: "win"
short_name: "win"
@@ -242,36 +212,6 @@
short_name: "cf-jctf"
}
builders {
- name: "buildbucket/luci.r8.ci/d8-linux"
- category: "D8"
- short_name: "linux"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-4.0.4"
- category: "D8"
- short_name: "4.0.4"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-4.4.4"
- category: "D8"
- short_name: "4.4.4"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-5.1.1"
- category: "D8"
- short_name: "5.1.1"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-6.0.1"
- category: "D8"
- short_name: "6.0.1"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-7.0.0"
- category: "D8"
- short_name: "7.0.0"
- }
- builders {
name: "buildbucket/luci.r8.ci/windows"
category: "win"
short_name: "win"
diff --git a/infra/config/global/luci-notify.cfg b/infra/config/global/luci-notify.cfg
index bb27c81..58bad4c 100644
--- a/infra/config/global/luci-notify.cfg
+++ b/infra/config/global/luci-notify.cfg
@@ -28,56 +28,26 @@
repository: "https://r8.googlesource.com/r8"
}
builders {
- name: "d8-linux"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
- name: "d8-linux-android-4.0.4"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
name: "d8-linux-android-4.0.4_release"
bucket: "ci"
repository: "https://r8.googlesource.com/r8"
}
builders {
- name: "d8-linux-android-4.4.4"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
name: "d8-linux-android-4.4.4_release"
bucket: "ci"
repository: "https://r8.googlesource.com/r8"
}
builders {
- name: "d8-linux-android-5.1.1"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
name: "d8-linux-android-5.1.1_release"
bucket: "ci"
repository: "https://r8.googlesource.com/r8"
}
builders {
- name: "d8-linux-android-6.0.1"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
name: "d8-linux-android-6.0.1_release"
bucket: "ci"
repository: "https://r8.googlesource.com/r8"
}
builders {
- name: "d8-linux-android-7.0.0"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
name: "d8-linux-android-7.0.0_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 dca0298..80de746 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -24,14 +24,6 @@
refs: "refs/heads/master"
}
triggers: "archive"
- triggers: "d8-linux"
- triggers: "d8-linux"
- triggers: "d8-linux-android-4.0.4"
- triggers: "d8-linux-android-4.4.4"
- triggers: "d8-linux-android-5.1.1"
- triggers: "d8-linux-android-6.0.1"
- triggers: "d8-linux-android-7.0.0"
- triggers: "linux"
triggers: "linux"
triggers: "linux-android-4.0.4"
triggers: "linux-android-4.4.4"
@@ -97,29 +89,6 @@
}
job {
- id: "d8-linux"
- acl_sets: "default"
- triggering_policy: {
- max_concurrent_invocations: 2
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux"
- }
-}
-
-job {
- id: "d8-linux-android-4.0.4"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-android-4.0.4"
- }
-}
-
-job {
id: "d8-linux-android-4.0.4_release"
acl_sets: "default"
buildbucket {
@@ -130,16 +99,6 @@
}
job {
- id: "d8-linux-android-4.4.4"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-android-4.4.4"
- }
-}
-
-job {
id: "d8-linux-android-4.4.4_release"
acl_sets: "default"
buildbucket {
@@ -150,19 +109,6 @@
}
job {
- id: "d8-linux-android-5.1.1"
- acl_sets: "default"
- triggering_policy: {
- max_concurrent_invocations: 2
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-android-5.1.1"
- }
-}
-
-job {
id: "d8-linux-android-5.1.1_release"
acl_sets: "default"
buildbucket {
@@ -173,16 +119,6 @@
}
job {
- id: "d8-linux-android-6.0.1"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-android-6.0.1"
- }
-}
-
-job {
id: "d8-linux-android-6.0.1_release"
acl_sets: "default"
buildbucket {
@@ -193,16 +129,6 @@
}
job {
- id: "d8-linux-android-7.0.0"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-android-7.0.0"
- }
-}
-
-job {
id: "d8-linux-android-7.0.0_release"
acl_sets: "default"
buildbucket {
diff --git a/tools/test.py b/tools/test.py
index 6f664eb..3aaa35c 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -87,9 +87,6 @@
result.add_option('--jctf-compile-only', '--jctf_compile_only',
help="Don't run, only compile JCTF tests.",
default=False, action='store_true')
- result.add_option('--aosp-jar', '--aosp_jar',
- help='Run aosp_jar test.',
- default=False, action='store_true')
result.add_option('--disable-assertions', '--disable_assertions',
help='Disable assertions when running tests.',
default=False, action='store_true')
@@ -171,8 +168,6 @@
gradle_args.append('-Ponly_jctf')
if options.jctf_compile_only:
gradle_args.append('-Pjctf_compile_only')
- if options.aosp_jar:
- gradle_args.append('-Paosp_jar')
if options.disable_assertions:
gradle_args.append('-Pdisable_assertions')
if options.with_code_coverage:
diff --git a/tools/test_aosp_jar.py b/tools/test_aosp_jar.py
deleted file mode 100755
index 6f7e8f5..0000000
--- a/tools/test_aosp_jar.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2017, the R8 project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Test prebuilt AOSP jar files: compile with D8 and run dex2out to validate
-
-from __future__ import print_function
-from glob import glob
-from itertools import chain
-from os.path import join
-import argparse
-import jdk
-import os
-import subprocess
-import sys
-
-import gradle
-
-import dex2oat
-import utils
-
-REPLAY_SCRIPT_DIR = join(utils.REPO_ROOT, 'third_party',
- 'android_cts_baseline', 'dx_replay')
-REPLAY_SCRIPT = join(REPLAY_SCRIPT_DIR, 'replay_script.py')
-OUT_DIR = join(REPLAY_SCRIPT_DIR, 'out')
-
-def parse_arguments():
- parser = argparse.ArgumentParser(
- description = 'Run D8 (CompatDX) and dex2oat on prebuilt AOSP jars.')
- parser.add_argument('--no-build', default = False, action = 'store_true')
- return parser.parse_args()
-
-def Main():
- args = parse_arguments()
-
- if not args.no_build:
- gradle.RunGradle(['CompatDx'])
-
- cmd = [REPLAY_SCRIPT, jdk.GetJavaExecutable(), '-jar', utils.COMPATDX_JAR]
- utils.PrintCmd(cmd)
- subprocess.check_call(cmd)
-
- # collect dex files below OUT_DIR
- dex_files = (chain.from_iterable(glob(join(x[0], '*.dex'))
- for x in os.walk(OUT_DIR)))
-
- for dex_file in dex_files:
- dex2oat.run(dex_file)
-
-
-if __name__ == '__main__':
- sys.exit(Main())
