config: Use hana in place of oak.
Hana is the only remaining board in the oak board_group.
BUG=None
TEST=refresh
Change-Id: I94dc53957f3a609bcbd68af9ed3dbe1966ccb933
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2676606
Reviewed-by: Mike Nichols <mikenichols@chromium.org>
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
Tested-by: LaMont Jones <lamontjones@chromium.org>
diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index 1503305..b4bf419 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -1424,9 +1424,9 @@
'arm-generic',
'arm64-generic',
'eve',
+ 'hana',
'kevin',
'kevin64',
- 'oak',
'tael',
'tatl',
])
diff --git a/config/chromeos_config_boards.py b/config/chromeos_config_boards.py
index ef63301..4d7bcf8 100644
--- a/config/chromeos_config_boards.py
+++ b/config/chromeos_config_boards.py
@@ -27,11 +27,11 @@
'beaglebone_servo',
'capri-zfpga',
'gale',
+ 'hana',
'kevin-arc64',
'littlejoe',
'nyan_big',
'nyan_blaze',
- 'oak',
'tael',
'veyron_jaq',
'veyron_mighty',
diff --git a/config/config_dump.json b/config/config_dump.json
index bffe91a..8790a21 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -18099,6 +18099,7 @@
"hana"
],
"manifest_branch": "main",
+ "manifest_version": true,
"prebuilts": "public",
"run_cpeexport": true,
"useflags": [
@@ -18125,6 +18126,7 @@
"hw_tests_override": null,
"luci_builder": "Try",
"manifest_branch": "main",
+ "manifest_version": true,
"prebuilts": "public",
"run_cpeexport": true,
"useflags": [
@@ -24335,10 +24337,10 @@
"arm-generic-full",
"arm64-generic-full",
"eve-full",
+ "hana-full",
"kevin-full",
"kevin64-full",
"lakitu-full",
- "oak-full",
"tael-full",
"tatl-full"
],
@@ -24373,10 +24375,10 @@
"arm-generic-full-tryjob",
"arm64-generic-full-tryjob",
"eve-full-tryjob",
+ "hana-full-tryjob",
"kevin-full-tryjob",
"kevin64-full-tryjob",
"lakitu-full-tryjob",
- "oak-full-tryjob",
"tael-full-tryjob",
"tatl-full-tryjob"
],
@@ -26871,141 +26873,6 @@
"suite_scheduling": false,
"workspace_branch": "factory-nyan-5772.B"
},
- "oak-full": {
- "_template": "full",
- "boards": [
- "oak"
- ],
- "manifest_branch": "main",
- "manifest_version": true,
- "prebuilts": "public",
- "run_cpeexport": true,
- "useflags": [
- "-chrome_internal"
- ],
- "vm_tests": []
- },
- "oak-full-tryjob": {
- "_template": "full",
- "boards": [
- "oak"
- ],
- "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\": 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-installer\",\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-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",
- "manifest_branch": "main",
- "manifest_version": true,
- "prebuilts": "public",
- "run_cpeexport": true,
- "useflags": [
- "-chrome_internal"
- ],
- "vm_tests": []
- },
- "oak-llvm-next-toolchain": {
- "_template": "llvm_next_toolchain",
- "boards": [
- "oak"
- ]
- },
- "oak-llvm-next-toolchain-tryjob": {
- "_template": "llvm_next_toolchain",
- "boards": [
- "oak"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "oak-llvm-toolchain": {
- "_template": "llvm_toolchain",
- "boards": [
- "oak"
- ]
- },
- "oak-llvm-toolchain-tryjob": {
- "_template": "llvm_toolchain",
- "boards": [
- "oak"
- ],
- "debug": true,
- "display_label": "tryjob",
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "oak-payloads": {
- "_template": "payloads",
- "boards": [
- "oak"
- ]
- },
- "oak-payloads-tryjob": {
- "_template": "payloads",
- "boards": [
- "oak"
- ],
- "debug": true,
- "hw_tests_override": null,
- "luci_builder": "Try"
- },
- "oak-release": {
- "_template": "release",
- "boards": [
- "oak"
- ],
- "vm_tests": [],
- "vm_tests_override": null
- },
- "oak-release-tryjob": {
- "_template": "release",
- "boards": [
- "oak"
- ],
- "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\": 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-installer\",\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-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
- },
- "oak-unittest-stress": {
- "_template": "unittest_stress",
- "boards": [
- "oak"
- ],
- "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"
- ]
- },
"octavius-full": {
"_template": "full",
"boards": [
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index 40caa35..ff4a022 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -213,10 +213,10 @@
arm-generic-full
arm64-generic-full
eve-full
+ hana-full
kevin-full
kevin64-full
lakitu-full
- oak-full
tael-full
tatl-full
@@ -1477,10 +1477,10 @@
arm-generic-full-tryjob
arm64-generic-full-tryjob
eve-full-tryjob
+ hana-full-tryjob
kevin-full-tryjob
kevin64-full-tryjob
lakitu-full-tryjob
- oak-full-tryjob
tael-full-tryjob
tatl-full-tryjob
master-incremental-tryjob
@@ -1763,12 +1763,6 @@
nyan_blaze-release-tryjob
nyan_blaze-unittest-stress
nyan_kitty-factory-nyan-5772.B-factorybranch-tryjob
- oak-full-tryjob
- oak-llvm-next-toolchain-tryjob
- oak-llvm-toolchain-tryjob
- oak-payloads-tryjob
- oak-release-tryjob
- oak-unittest-stress
octavius-full-tryjob
octavius-llvm-next-toolchain-tryjob
octavius-llvm-toolchain-tryjob
