bluetooth: Create bluetooth_floss_cq suite and add tests

Create a new suite to run in floss CQ and add tests to it

BUG=b:233641006
TEST=None

Change-Id: Ie9294fabc625666d38308b5b0502cb9d45c28eb7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3673997
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@google.com>
Commit-Queue: Shijin Abraham <shijinabraham@google.com>
Commit-Queue: Abhishek Pandit-Subedi <abhishekpandit@google.com>
Auto-Submit: Shijin Abraham <shijinabraham@google.com>
Tested-by: Shijin Abraham <shijinabraham@google.com>

6 files changed, 34 insertions, 4 deletions

diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_a2dp_test.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_a2dp_test.floss
index b71eda57fd..bfc1926f09 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_a2dp_test.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_a2dp_test.floss
@@ -8,7 +8,7 @@ AUTHOR = 'chromeos-bluetooth'
 NAME = 'bluetooth_AdapterAUHealth.au_a2dp_test.floss'
 PURPOSE = ('Batch of Bluetooth Classic Audio health tests')
 CRITERIA = 'Pass all health test'
-ATTRIBUTES = 'suite:bluetooth_floss'
+ATTRIBUTES = 'suite:bluetooth_floss,suite:bluetooth_floss_cq'
 TIME = 'SHORT'  # Approximately 2 mins
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'bluetooth'
diff --git a/server/site_tests/bluetooth_AdapterCLHealth/control.cl_HID_reports_test.floss b/server/site_tests/bluetooth_AdapterCLHealth/control.cl_HID_reports_test.floss
index 29f382cb1a..f2e935d3c9 100644
--- a/server/site_tests/bluetooth_AdapterCLHealth/control.cl_HID_reports_test.floss
+++ b/server/site_tests/bluetooth_AdapterCLHealth/control.cl_HID_reports_test.floss
@@ -9,7 +9,7 @@ NAME = 'bluetooth_AdapterCLHealth.cl_HID_reports_test.floss'
 PURPOSE = ('Test bluetooth adapter receiving reports from '
            'bluetooth HID devices.')
 CRITERIA = 'Adapter should receive HID events correctly.'
-ATTRIBUTES = 'suite:bluetooth_floss'
+ATTRIBUTES = 'suite:bluetooth_floss,suite:bluetooth_floss_cq'
 TIME = 'SHORT'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'bluetooth'
diff --git a/server/site_tests/bluetooth_AdapterLEHealth/control.le_keyboard_reports.floss b/server/site_tests/bluetooth_AdapterLEHealth/control.le_keyboard_reports.floss
index 3f403764d7..d4bb74750c 100644
--- a/server/site_tests/bluetooth_AdapterLEHealth/control.le_keyboard_reports.floss
+++ b/server/site_tests/bluetooth_AdapterLEHealth/control.le_keyboard_reports.floss
@@ -8,7 +8,7 @@ AUTHOR = 'chromeos-bluetooth'
 NAME = 'bluetooth_AdapterLEHealth.le_keyboard_reports.floss'
 PURPOSE = ('Batch of Bluetooth LE health tests')
 CRITERIA = 'Pass all health test'
-ATTRIBUTES = 'suite:bluetooth_floss'
+ATTRIBUTES = 'suite:bluetooth_floss,suite:bluetooth_floss_cq'
 TIME = 'MEDIUM'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'bluetooth'
diff --git a/server/site_tests/bluetooth_AdapterLEHealth/control.le_mouse_reports.floss b/server/site_tests/bluetooth_AdapterLEHealth/control.le_mouse_reports.floss
index d3503d233b..3dc044320e 100644
--- a/server/site_tests/bluetooth_AdapterLEHealth/control.le_mouse_reports.floss
+++ b/server/site_tests/bluetooth_AdapterLEHealth/control.le_mouse_reports.floss
@@ -8,7 +8,7 @@ AUTHOR = 'chromeos-bluetooth'
 NAME = 'bluetooth_AdapterLEHealth.le_mouse_reports.floss'
 PURPOSE = ('Batch of Bluetooth LE health tests')
 CRITERIA = 'Pass all health test'
-ATTRIBUTES = 'suite:bluetooth_floss'
+ATTRIBUTES = 'suite:bluetooth_floss,suite:bluetooth_floss_cq'
 TIME = 'MEDIUM'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'bluetooth'
diff --git a/site_utils/attribute_allowlist.txt b/site_utils/attribute_allowlist.txt
index aa17a16443..0fee9c526c 100644
--- a/site_utils/attribute_allowlist.txt
+++ b/site_utils/attribute_allowlist.txt
@@ -41,6 +41,7 @@ suite:bluetooth_e2e
 suite:bluetooth_e2e_cq
 suite:bluetooth_flaky
 suite:bluetooth_floss
+suite:bluetooth_floss_cq
 suite:bluetooth_health
 suite:bluetooth_mtbf
 suite:bluetooth_qualification
diff --git a/test_suites/control.bluetooth_floss_cq b/test_suites/control.bluetooth_floss_cq
new file mode 100644
index 0000000000..b5d22e719e
--- /dev/null
+++ b/test_suites/control.bluetooth_floss_cq
@@ -0,0 +1,29 @@
+# Copyright (c) 2020 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 = "ChromeOS Bluetooth Team"
+NAME = "bluetooth_floss_cq"
+PURPOSE = "Bluetooth tests to be included in rfcell CQ for Project Floss"
+
+TIME = "Medium"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+This suite contains bluetooth tests that require Bluetooth peers
+to be run in rfcell CQ for changes in Floss project
+
+Details of Bluetooth suites can be found at
+https://g3doc.corp.google.com/company/teams/chrome/ops/chromeos/engprod/connectivity/bluetooth/automated_tests_and_lab.md
+"""
+
+import common
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+args_dict['name'] = NAME
+args_dict['add_experimental'] = True
+args_dict['job'] = job
+
+dynamic_suite.reimage_and_run(**args_dict)