Update config settings by config-updater.
Change-Id: Ib86e3abcc5341fbb1d0fad885d3250a04a75c610
diff --git a/config/config_dump.json b/config/config_dump.json
index 3510848..1636f61 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -3711,138 +3711,6 @@
"chrome_internal"
]
},
- "betty-arcmaster-full": {
- "_template": "full",
- "boards": [
- "betty-arcmaster"
- ],
- "prebuilts": "public",
- "run_cpeexport": true,
- "useflags": [
- "-chrome_internal"
- ],
- "vm_tests": []
- },
- "betty-arcmaster-full-tryjob": {
- "_template": "full",
- "boards": [
- "betty-arcmaster"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-arc\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-informational\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"CQ\",\n \"quota_account\": \"bvt-sync\",\n \"retry\": true,\n \"suite\": \"bvt-installer\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-perbuild\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
- ],
- "hw_tests_override": null,
- "luci_builder": "Try",
- "prebuilts": "public",
- "run_cpeexport": true,
- "useflags": [
- "-chrome_internal"
- ],
- "vm_tests": []
- },
- "betty-arcmaster-llvm-next-toolchain": {
- "_template": "llvm_next_toolchain",
- "boards": [
- "betty-arcmaster"
- ]
- },
- "betty-arcmaster-llvm-next-toolchain-tryjob": {
- "_template": "llvm_next_toolchain",
- "boards": [
- "betty-arcmaster"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "betty-arcmaster-llvm-toolchain": {
- "_template": "llvm_toolchain",
- "boards": [
- "betty-arcmaster"
- ]
- },
- "betty-arcmaster-llvm-toolchain-tryjob": {
- "_template": "llvm_toolchain",
- "boards": [
- "betty-arcmaster"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "betty-arcmaster-payloads": {
- "_template": "payloads",
- "boards": [
- "betty-arcmaster"
- ]
- },
- "betty-arcmaster-payloads-tryjob": {
- "_template": "payloads",
- "boards": [
- "betty-arcmaster"
- ],
- "debug": true,
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "betty-arcmaster-release": {
- "_template": "release",
- "boards": [
- "betty-arcmaster"
- ],
- "important": false,
- "vm_tests": [],
- "vm_tests_override": null
- },
- "betty-arcmaster-release-tryjob": {
- "_template": "release",
- "boards": [
- "betty-arcmaster"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-arc\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-informational\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"CQ\",\n \"quota_account\": \"bvt-sync\",\n \"retry\": true,\n \"suite\": \"bvt-installer\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-perbuild\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
- ],
- "hw_tests_override": null,
- "luci_builder": "Try",
- "paygen": false,
- "push_image": false,
- "suite_scheduling": false,
- "vm_tests": [],
- "vm_tests_override": null
- },
- "betty-arcmaster-unittest-stress": {
- "_template": "unittest_stress",
- "boards": [
- "betty-arcmaster"
- ],
- "hw_tests_override": null,
- "internal": true,
- "luci_builder": "Try",
- "manifest": "official.xml",
- "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
- "overlays": "both",
- "useflags": [
- "chrome_internal"
- ]
- },
"betty-arcvm-master-full": {
"_template": "full",
"boards": [
@@ -22065,7 +21933,6 @@
"beaglebone-release",
"beaglebone_servo-release",
"betty-arc-r-release",
- "betty-arcmaster-release",
"betty-arcvm-master-release",
"betty-kernelnext-release",
"betty-pi-arc-release",
@@ -22272,7 +22139,6 @@
"beaglebone-release-tryjob",
"beaglebone_servo-release-tryjob",
"betty-arc-r-release-tryjob",
- "betty-arcmaster-release-tryjob",
"betty-arcvm-master-release-tryjob",
"betty-kernelnext-release-tryjob",
"betty-pi-arc-release-tryjob",
diff --git a/config/ge_build_config.json b/config/ge_build_config.json
index 8d1831d..9595e35 100644
--- a/config/ge_build_config.json
+++ b/config/ge_build_config.json
@@ -134,18 +134,6 @@
]
},
{
- "name": "betty-arcmaster",
- "configs": [
- {
- "builder": "RELEASE",
- "experimental": true,
- "leader_board": false,
- "board_group": "",
- "arch": "X86_INTERNAL"
- }
- ]
- },
- {
"name": "betty-arcvm-master",
"configs": [
{
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index 7d5bf02..98d3385 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -251,7 +251,6 @@
beaglebone-release
beaglebone_servo-release
betty-arc-r-release
- betty-arcmaster-release
betty-arcvm-master-release
betty-kernelnext-release
betty-pi-arc-release
@@ -526,12 +525,6 @@
betty-arc-r-payloads-tryjob
betty-arc-r-release-tryjob
betty-arc-r-unittest-stress
- betty-arcmaster-full-tryjob
- betty-arcmaster-llvm-next-toolchain-tryjob
- betty-arcmaster-llvm-toolchain-tryjob
- betty-arcmaster-payloads-tryjob
- betty-arcmaster-release-tryjob
- betty-arcmaster-unittest-stress
betty-arcvm-master-full-tryjob
betty-arcvm-master-llvm-next-toolchain-tryjob
betty-arcvm-master-llvm-toolchain-tryjob
@@ -1392,7 +1385,6 @@
beaglebone-release-tryjob
beaglebone_servo-release-tryjob
betty-arc-r-release-tryjob
- betty-arcmaster-release-tryjob
betty-arcvm-master-release-tryjob
betty-kernelnext-release-tryjob
betty-pi-arc-release-tryjob
