Add Nearby suites that test against dev and prod Android NS versions
The existing nearby-share suite tests against modulefood Android Nearby
Share. We also want to test against prod and dev versions (see
go/cros-android-nearby-version-skew-testing), but not against all CrOS
versions like the nearby-share suite does. Add 2 new suites so we can
schedule the prod Android tests against CrOS stable, and the dev Android
tests against CrOS dev.
BUG=b:207026818
TEST=test_that <dut> tast.nearby-share-prod
TEST=test_that <dut> tast.nearby-share-dev
Change-Id: I3cab7ff1fff809d88b0795696a63d2088815fda6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3564898
Tested-by: Kyle Shimabukuro <kyleshima@chromium.org>
Reviewed-by: Derek Beckett <dbeckett@chromium.org>
Feels: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: David Haddock <dhaddock@chromium.org>
Feels: David Haddock <dhaddock@chromium.org>
Reviewed-by: Garry Wang <xianuowang@chromium.org>
Commit-Queue: David Haddock <dhaddock@chromium.org>
diff --git a/server/site_tests/tast/control.nearby-share-dev b/server/site_tests/tast/control.nearby-share-dev
new file mode 100644
index 0000000..33da730
--- /dev/null
+++ b/server/site_tests/tast/control.nearby-share-dev
@@ -0,0 +1,24 @@
+# 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 = 'ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)'
+NAME = 'tast.nearby-share-dev'
+TIME = 'MEDIUM'
+TEST_TYPE = 'Server'
+ATTRIBUTES = 'suite:nearby-share-dev'
+MAX_RESULT_SIZE_KB = 1024 * 1024
+PY_VERSION = 3
+
+# tast.py uses binaries installed from autotest_server_package.tar.bz2.
+REQUIRE_SSP = True
+
+DOC = '''Run the Tast Nearby Share test suite with dev Android NS.'''
+
+def run(machine):
+ job.run_test('tast',
+ host=hosts.create_host(machine),
+ test_exprs=['("group:nearby-share-dev")'],
+ ignore_test_failures=True, max_run_sec=10800,
+ command_args=args)
+parallel_simple(run, machines)
diff --git a/server/site_tests/tast/control.nearby-share-prod b/server/site_tests/tast/control.nearby-share-prod
new file mode 100644
index 0000000..0d3edfd
--- /dev/null
+++ b/server/site_tests/tast/control.nearby-share-prod
@@ -0,0 +1,24 @@
+# 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 = 'ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)'
+NAME = 'tast.nearby-share-prod'
+TIME = 'MEDIUM'
+TEST_TYPE = 'Server'
+ATTRIBUTES = 'suite:nearby-share-prod'
+MAX_RESULT_SIZE_KB = 1024 * 1024
+PY_VERSION = 3
+
+# tast.py uses binaries installed from autotest_server_package.tar.bz2.
+REQUIRE_SSP = True
+
+DOC = '''Run the Tast Nearby Share test suite with prod Android NS.'''
+
+def run(machine):
+ job.run_test('tast',
+ host=hosts.create_host(machine),
+ test_exprs=['("group:nearby-share-prod")'],
+ ignore_test_failures=True, max_run_sec=10800,
+ command_args=args)
+parallel_simple(run, machines)
diff --git a/site_utils/attribute_allowlist.txt b/site_utils/attribute_allowlist.txt
index 178d89c..ec7e1a4 100644
--- a/site_utils/attribute_allowlist.txt
+++ b/site_utils/attribute_allowlist.txt
@@ -253,6 +253,8 @@
suite:mtp
suite:nbr
suite:nearby-share
+suite:nearby-share-dev
+suite:nearby-share-prod
suite:nearby-share-remote
suite:network_nightly
suite:network_ui
diff --git a/test_suites/control.nearby-share-dev b/test_suites/control.nearby-share-dev
new file mode 100644
index 0000000..0f1eb53
--- /dev/null
+++ b/test_suites/control.nearby-share-dev
@@ -0,0 +1,19 @@
+# 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 = "ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)"
+NAME = "nearby-share-dev"
+PURPOSE = "Nearby Share tests on Chrome OS devices with dev Android Nearby."
+TIME = "SHORT"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+DOC = """ This suite runs Nearby Share tests. """
+
+import common
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+args_dict['max_runtime_mins'] = 60
+args_dict['name'] = NAME
+args_dict['job'] = job
+dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.nearby-share-prod b/test_suites/control.nearby-share-prod
new file mode 100644
index 0000000..b34fba4
--- /dev/null
+++ b/test_suites/control.nearby-share-prod
@@ -0,0 +1,19 @@
+# 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 = "ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)"
+NAME = "nearby-share-prod"
+PURPOSE = "Nearby Share tests on Chrome OS devices with prod Android Nearby."
+TIME = "SHORT"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+DOC = """ This suite runs Nearby Share tests. """
+
+import common
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+args_dict['max_runtime_mins'] = 60
+args_dict['name'] = NAME
+args_dict['job'] = job
+dynamic_suite.reimage_and_run(**args_dict)
