[cbuildbot] Update toolchain waterfall builders.
Make the llvm-next waterfall builders use clang to build Chrome;
add more of the toolchain correctness tests to the toolchain builders.
BUG=None
TEST=Ran run_tests.
Change-Id: I2b53d54613037db1656d39a2e03b736b0bf5221d
Reviewed-on: https://chromium-review.googlesource.com/353654
Commit-Ready: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Reviewed-by: Yunlian Jiang <yunlian@chromium.org>
diff --git a/cbuildbot/chromeos_config.py b/cbuildbot/chromeos_config.py
index 9c23c91..214cb56 100644
--- a/cbuildbot/chromeos_config.py
+++ b/cbuildbot/chromeos_config.py
@@ -316,7 +316,7 @@
**default_dict)]
@classmethod
def ToolchainTest(cls, **kwargs):
- """Return a list of HWTESTConfigs which run toolchain tests."""
+ """Return a list of HWTESTConfigs which run toolchain correctness tests."""
default_dict = dict(pool=constants.HWTEST_MACH_POOL, file_bugs=False,
priority=constants.HWTEST_DEFAULT_PRIORITY)
default_dict.update(kwargs)
@@ -325,6 +325,14 @@
config_lib.HWTestConfig(constants.HWTEST_COMMIT_SUITE,
**default_dict),
config_lib.HWTestConfig(constants.HWTEST_TOOLCHAIN_SUITE,
+ **default_dict),
+ config_lib.HWTestConfig('paygen_au_canary',
+ **default_dict),
+ config_lib.HWTestConfig('security',
+ **default_dict),
+ config_lib.HWTestConfig('kernel_daily_regression',
+ **default_dict),
+ config_lib.HWTestConfig('kernel_daily_benchmarks',
**default_dict)]
@@ -2250,22 +2258,22 @@
site_config.Add(
'peppy-next-toolchain-llvm', llvm,
boards=['peppy'],
- useflags=append_useflags(['llvm-next']),
+ useflags=append_useflags(['llvm-next clang']),
),
site_config.Add(
'daisy-next-toolchain-llvm', _llvm_grouped,
boards=['daisy'],
- useflags=append_useflags(['llvm-next']),
+ useflags=append_useflags(['llvm-next clang']),
),
site_config.Add(
'x86-alex-next-toolchain-llvm', _llvm_grouped,
boards=['x86-alex'],
- useflags=append_useflags(['llvm-next']),
+ useflags=append_useflags(['llvm-next clang']),
),
site_config.Add(
'oak-next-toolchain-llvm', _llvm_grouped,
boards=['oak'],
- useflags=append_useflags(['llvm-next']),
+ useflags=append_useflags(['llvm-next clang']),
),
)
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 19906ef..f3573e6 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -771,12 +771,20 @@
"hw_tests": [
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"toolchain-tests\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}"
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"toolchain-tests\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"paygen_au_canary\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"security\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"kernel_daily_regression\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"kernel_daily_benchmarks\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}"
],
"hw_tests_override": [
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"toolchain-tests\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}"
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"toolchain-tests\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"paygen_au_canary\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"security\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"kernel_daily_regression\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"kernel_daily_benchmarks\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}"
],
"hwqual": true,
"image_test": true,
@@ -865,12 +873,20 @@
"hw_tests": [
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"toolchain-tests\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}"
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"toolchain-tests\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"paygen_au_canary\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"security\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"kernel_daily_regression\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"kernel_daily_benchmarks\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}"
],
"hw_tests_override": [
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"toolchain-tests\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}"
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"toolchain-tests\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"paygen_au_canary\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"security\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"kernel_daily_regression\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"kernel_daily_benchmarks\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}"
],
"hwqual": true,
"image_test": true,
@@ -6197,7 +6213,7 @@
"useflags": [
"-cros-debug",
"chrome_internal",
- "llvm-next"
+ "llvm-next clang"
]
},
"daisy-no-vmtest-pre-cq": {
@@ -12234,7 +12250,7 @@
"useflags": [
"-cros-debug",
"chrome_internal",
- "llvm-next"
+ "llvm-next clang"
]
},
{
@@ -12250,7 +12266,7 @@
"useflags": [
"-cros-debug",
"chrome_internal",
- "llvm-next"
+ "llvm-next clang"
]
},
{
@@ -12266,7 +12282,7 @@
"useflags": [
"-cros-debug",
"chrome_internal",
- "llvm-next"
+ "llvm-next clang"
]
},
{
@@ -12282,14 +12298,14 @@
"useflags": [
"-cros-debug",
"chrome_internal",
- "llvm-next"
+ "llvm-next clang"
]
}
],
"useflags": [
"-cros-debug",
"chrome_internal",
- "llvm-next"
+ "llvm-next clang"
]
},
"llvm-toolchain-group": {
@@ -14854,7 +14870,7 @@
"useflags": [
"-cros-debug",
"chrome_internal",
- "llvm-next"
+ "llvm-next clang"
]
},
"oak-no-vmtest-pre-cq": {
@@ -16354,7 +16370,7 @@
"useflags": [
"-cros-debug",
"chrome_internal",
- "llvm-next"
+ "llvm-next clang"
]
},
"peppy-no-vmtest-pre-cq": {
@@ -24392,7 +24408,7 @@
"useflags": [
"-cros-debug",
"chrome_internal",
- "llvm-next"
+ "llvm-next clang"
]
},
"x86-alex-no-vmtest-pre-cq": {
