cft: expand post-submit beta slightly, add cq beta

post-submit (py3-beta) expanding to a servo test.
creating new suite (cft-beta) to be used for release/CQ

BUG=None
TEST=cq

Change-Id: I32115da206fd5a4d9bd71190ee0c69e8d43ba840
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3645662
Reviewed-by: Azizur Rahman <azrahman@google.com>
Auto-Submit: Derek Beckett <dbeckett@chromium.org>
Tested-by: Derek Beckett <dbeckett@chromium.org>
Commit-Queue: Azizur Rahman <azrahman@google.com>

8 files changed, 33 insertions, 6 deletions

diff --git a/client/site_tests/audio_AudioInputGain/control b/client/site_tests/audio_AudioInputGain/control
index 84a6226b16..951a559186 100644
--- a/client/site_tests/audio_AudioInputGain/control
+++ b/client/site_tests/audio_AudioInputGain/control
@@ -9,7 +9,7 @@ CRITERIA = '''
 Control the input capture gain by chrome.audio API, and check the actual gain
 from the recorded wave of ALSA loopback.
 '''
-ATTRIBUTES = 'suite:audio_essential, suite:infra_qual'
+ATTRIBUTES = 'suite:audio_essential, suite:infra_qual, suite:py3-beta'
 TIME = 'SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'audio'
diff --git a/server/site_tests/firmware_FAFTRPC/control.all b/server/site_tests/firmware_FAFTRPC/control.all
index 4ad6984031..7ba32aa6e7 100644
--- a/server/site_tests/firmware_FAFTRPC/control.all
+++ b/server/site_tests/firmware_FAFTRPC/control.all
@@ -8,7 +8,7 @@ AUTHOR = "kmshelton, waihong"
 NAME = "firmware_FAFTRPC.all"
 PURPOSE = "Verify that the RPC server, and all RPC functions, work as expected."
 CRITERIA = "This test will fail if the FAFT RPC system is not set up correctly."
-ATTRIBUTES = "suite:infra_qual"
+ATTRIBUTES = "suite:infra_qual, suite:py3-beta"
 DEPENDENCIES = "servo_state:WORKING"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
diff --git a/server/site_tests/stub_ServerToClientPass/control b/server/site_tests/stub_ServerToClientPass/control
index 248adb27ef..ef339e7722 100644
--- a/server/site_tests/stub_ServerToClientPass/control
+++ b/server/site_tests/stub_ServerToClientPass/control
@@ -8,7 +8,7 @@ TIME = 'SHORT'
 TEST_CATEGORY = 'General'
 TEST_CLASS = 'stub'
 TEST_TYPE = 'server'
-ATTRIBUTES = 'suite:infra_qual, suite:py3-beta'
+ATTRIBUTES = 'suite:infra_qual, suite:py3-beta, suite:cft-beta'
 PY_VERSION = 3
 
 DOC = """
diff --git a/server/site_tests/tast/control.critical-chrome-shard-0 b/server/site_tests/tast/control.critical-chrome-shard-0
index e4b7365a73..49ed14c6d4 100644
--- a/server/site_tests/tast/control.critical-chrome-shard-0
+++ b/server/site_tests/tast/control.critical-chrome-shard-0
@@ -11,7 +11,7 @@ TEST_TYPE = 'Server'
 DEPENDENCIES = 'servo_state:WORKING'
 # Android changes can't break Chrome tests (so we don't need to run them in the
 # Android PFQ), but OS changes can (so we need to run them in the CQ).
-ATTRIBUTES = 'suite:bvt-tast-cq, suite:bvt-tast-chrome-pfq, suite:py3-beta'
+ATTRIBUTES = 'suite:bvt-tast-cq, suite:bvt-tast-chrome-pfq, suite:py3-beta, suite:cft-beta'
 MAX_RESULT_SIZE_KB = 256 * 1024
 PY_VERSION = 3
 
diff --git a/server/site_tests/tast/control.critical-chrome-shard-1 b/server/site_tests/tast/control.critical-chrome-shard-1
index ab8c3722d6..6557094535 100644
--- a/server/site_tests/tast/control.critical-chrome-shard-1
+++ b/server/site_tests/tast/control.critical-chrome-shard-1
@@ -11,7 +11,7 @@ TEST_TYPE = 'Server'
 DEPENDENCIES = 'servo_state:WORKING'
 # Android changes can't break Chrome tests (so we don't need to run them in the
 # Android PFQ), but OS changes can (so we need to run them in the CQ).
-ATTRIBUTES = 'suite:bvt-tast-cq, suite:bvt-tast-chrome-pfq, suite:py3-beta'
+ATTRIBUTES = 'suite:bvt-tast-cq, suite:bvt-tast-chrome-pfq, suite:py3-beta, suite:cft-beta'
 MAX_RESULT_SIZE_KB = 256 * 1024
 PY_VERSION = 3
 
diff --git a/server/site_tests/tast/control.critical-chrome-shard-2 b/server/site_tests/tast/control.critical-chrome-shard-2
index f9902a6a45..1cd0a6a9ce 100644
--- a/server/site_tests/tast/control.critical-chrome-shard-2
+++ b/server/site_tests/tast/control.critical-chrome-shard-2
@@ -11,7 +11,7 @@ TEST_TYPE = 'Server'
 DEPENDENCIES = 'servo_state:WORKING'
 # Android changes can't break Chrome tests (so we don't need to run them in the
 # Android PFQ), but OS changes can (so we need to run them in the CQ).
-ATTRIBUTES = 'suite:bvt-tast-cq, suite:bvt-tast-chrome-pfq, suite:py3-beta'
+ATTRIBUTES = 'suite:bvt-tast-cq, suite:bvt-tast-chrome-pfq, suite:py3-beta, suite:cft-beta'
 MAX_RESULT_SIZE_KB = 256 * 1024
 PY_VERSION = 3
 
diff --git a/site_utils/attribute_allowlist.txt b/site_utils/attribute_allowlist.txt
index 202bf4e876..7d739aab01 100644
--- a/site_utils/attribute_allowlist.txt
+++ b/site_utils/attribute_allowlist.txt
@@ -152,6 +152,7 @@ suite:cellular_ota_avl
 suite:cellular_ota_flaky
 suite:cellular_pseudomodem
 suite:cellular_qual
+suite:cft-beta
 suite:check_setup_cts_N
 suite:check_setup_storage_qual
 suite:chrome-informational
diff --git a/test_suites/control.cft-beta b/test_suites/control.cft-beta
new file mode 100644
index 0000000000..7344461b3a
--- /dev/null
+++ b/test_suites/control.cft-beta
@@ -0,0 +1,26 @@
+# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = "dbeckett@"
+NAME = "cft-beta"
+PURPOSE = "Suite for CFT rollout in lab/CQ."
+TIME = "LONG"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+This suite is used flush out the CFT rollout in the lab.
+"""
+
+import common
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+args_dict['name'] = NAME
+args_dict['add_experimental'] = True
+args_dict['max_runtime_mins'] = 960
+args_dict['timeout_mins'] = 1440
+args_dict['job'] = job
+
+dynamic_suite.reimage_and_run(**args_dict)