Moving Recovery Cache tests to faft_lv6

BUG=None
TEST=None

Change-Id: Ifc9a6482c959611e7ef2f610e670879550502777
Reviewed-on: https://chromium-review.googlesource.com/470088
Commit-Ready: Tyler Reid <twreid@google.com>
Tested-by: Tyler Reid <twreid@google.com>
Reviewed-by: danny chan <dchan@chromium.org>
diff --git a/server/site_tests/firmware_CorruptRecoveryCache/control b/server/site_tests/firmware_CorruptRecoveryCache/control
index bac6752..1d577fb 100644
--- a/server/site_tests/firmware_CorruptRecoveryCache/control
+++ b/server/site_tests/firmware_CorruptRecoveryCache/control
@@ -8,7 +8,7 @@
 NAME = "firmware_CorruptRecoveryCache"
 PURPOSE = "Servo based RECOVERY_MRC_CACHE corruption test"
 CRITERIA = "This test will fail if the cache doesn't retrain and boot into recovery"
-ATTRIBUTES = "suite:faft, suite:faft_bios, suite:faft_lv3, suite:faft_normal, suite:faft_bios_tot"
+ATTRIBUTES = "suite:faft_lv6"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptRecoveryCache/control.dev b/server/site_tests/firmware_CorruptRecoveryCache/control.dev
index 3dfe97f..6466ac3 100644
--- a/server/site_tests/firmware_CorruptRecoveryCache/control.dev
+++ b/server/site_tests/firmware_CorruptRecoveryCache/control.dev
@@ -8,7 +8,7 @@
 NAME = "firmware_CorruptRecoveryCache"
 PURPOSE = "Servo based RECOVERY_MRC_CACHE corruption test"
 CRITERIA = "This test will fail if the cache doesn't retrain and boot into recovery"
-ATTRIBUTES = "suite:faft, suite:faft_bios, suite:faft_lv3, suite:faft_dev, suite:faft_bios_tot"
+ATTRIBUTES = "suite:faft_lv6"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RecoveryCacheBootKeys/control b/server/site_tests/firmware_RecoveryCacheBootKeys/control
index 88bbbd7..96781d3 100644
--- a/server/site_tests/firmware_RecoveryCacheBootKeys/control
+++ b/server/site_tests/firmware_RecoveryCacheBootKeys/control
@@ -8,7 +8,7 @@
 NAME = "firmware_RecoveryCacheBootKeys"
 PURPOSE = "Servo based RECOVERY_MRC_CACHE boot tests"
 CRITERIA = "This test will fail if the DUT doesn't use the cache during recovery boot."
-ATTRIBUTES = "suite:faft, suite:faft_bios, suite:faft_lv3, suite:faft_normal, suite:faft_bios_tot"
+ATTRIBUTES = "suite:faft_lv6"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RecoveryCacheBootKeys/control.dev b/server/site_tests/firmware_RecoveryCacheBootKeys/control.dev
index 0105eec..5e1dfb9 100644
--- a/server/site_tests/firmware_RecoveryCacheBootKeys/control.dev
+++ b/server/site_tests/firmware_RecoveryCacheBootKeys/control.dev
@@ -8,7 +8,7 @@
 NAME = "firmware_RecoveryCacheBootKeys"
 PURPOSE = "Servo based RECOVERY_MRC_CACHE boot tests"
 CRITERIA = "This test will fail if the DUT doesn't use the cache during recovery boot."
-ATTRIBUTES = "suite:faft, suite:faft_bios, suite:faft_lv3, suite:faft_dev, suite:faft_bios_tot"
+ATTRIBUTES = "suite:faft_lv6"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "firmware"