autotest: Split tast.informational into smaller pieces.
Split the tast.informational server test, which currently
runs informational Tast tests as part of the bvt-perbuild
suite, into separate tast.informational-android, -chrome,
and -system tests.
All three tests still run as part of bvt-perbuild, but
-android and -chrome also run as part of the
chrome-informational suite. This should result in
tot-chrome-pfq-informational builders running informational
Tast tests against ToT Chrome.
BUG=chromium:887575
TEST=passed all three expressions to "tast list" and
verified that they match the expected tests
Change-Id: I1448e29cab5b605fa75728c47b5fbe717f938359
Reviewed-on: https://chromium-review.googlesource.com/1237422
Commit-Ready: Dan Erat <derat@chromium.org>
Tested-by: Dan Erat <derat@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
diff --git a/server/site_tests/tast/control.informational b/server/site_tests/tast/control.informational-android
similarity index 68%
copy from server/site_tests/tast/control.informational
copy to server/site_tests/tast/control.informational-android
index 686bc60..939f3f2 100644
--- a/server/site_tests/tast/control.informational
+++ b/server/site_tests/tast/control.informational-android
@@ -6,21 +6,21 @@
NAME = 'tast.informational'
TIME = 'MEDIUM'
TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:bvt-perbuild'
+ATTRIBUTES = 'suite:bvt-perbuild, suite:chrome-informational'
# tast.py uses binaries installed from autotest_server_package.tar.bz2.
REQUIRE_SSP = True
DOC = '''
-Run the Tast informational test suite.
+Run the Tast informational ARC test suite.
Tast is an integration-testing framework analagous to the test-running portion
of Autotest. See https://chromium.googlesource.com/chromiumos/platform/tast/ for
more information.
-This test runs Tast-based informational tests against a remote DUT. It only
-reports failure if the tast process itself (rather than individual Tast tests)
-fails.
+This test runs Android-dependent Tast-based informational tests against a remote
+DUT. It only reports failure if the tast process itself (rather than individual
+Tast tests) fails.
See http://go/tast-failures for information about investigating failures.
'''
@@ -28,7 +28,7 @@
def run(machine):
job.run_test('tast',
host=hosts.create_host(machine),
- test_exprs=['(informational && !disabled)'],
+ test_exprs=['(informational && !disabled && "dep:android")'],
ignore_test_failures=True)
parallel_simple(run, machines)
diff --git a/server/site_tests/tast/control.informational b/server/site_tests/tast/control.informational-chrome
similarity index 62%
copy from server/site_tests/tast/control.informational
copy to server/site_tests/tast/control.informational-chrome
index 686bc60..2eec382 100644
--- a/server/site_tests/tast/control.informational
+++ b/server/site_tests/tast/control.informational-chrome
@@ -6,21 +6,21 @@
NAME = 'tast.informational'
TIME = 'MEDIUM'
TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:bvt-perbuild'
+ATTRIBUTES = 'suite:bvt-perbuild, suite:chrome-informational'
# tast.py uses binaries installed from autotest_server_package.tar.bz2.
REQUIRE_SSP = True
DOC = '''
-Run the Tast informational test suite.
+Run the Tast informational Chrome test suite.
Tast is an integration-testing framework analagous to the test-running portion
of Autotest. See https://chromium.googlesource.com/chromiumos/platform/tast/ for
more information.
-This test runs Tast-based informational tests against a remote DUT. It only
-reports failure if the tast process itself (rather than individual Tast tests)
-fails.
+This test runs Chrome-dependent Tast-based informational tests against a remote
+DUT. It only reports failure if the tast process itself (rather than individual
+Tast tests) fails.
See http://go/tast-failures for information about investigating failures.
'''
@@ -28,7 +28,9 @@
def run(machine):
job.run_test('tast',
host=hosts.create_host(machine),
- test_exprs=['(informational && !disabled)'],
+ test_exprs=['(informational && !disabled && '
+ '("dep:chrome" || "dep:chrome_login") && '
+ '!"dep:android")'],
ignore_test_failures=True)
parallel_simple(run, machines)
diff --git a/server/site_tests/tast/control.informational b/server/site_tests/tast/control.informational-system
similarity index 68%
rename from server/site_tests/tast/control.informational
rename to server/site_tests/tast/control.informational-system
index 686bc60..08c0b5c 100644
--- a/server/site_tests/tast/control.informational
+++ b/server/site_tests/tast/control.informational-system
@@ -18,9 +18,9 @@
of Autotest. See https://chromium.googlesource.com/chromiumos/platform/tast/ for
more information.
-This test runs Tast-based informational tests against a remote DUT. It only
-reports failure if the tast process itself (rather than individual Tast tests)
-fails.
+This test runs non-Chrome-dependent and non-Android-dependent Tast-based
+informational tests against a remote DUT. It only reports failure if the tast
+process itself (rather than individual Tast tests) fails.
See http://go/tast-failures for information about investigating failures.
'''
@@ -28,7 +28,9 @@
def run(machine):
job.run_test('tast',
host=hosts.create_host(machine),
- test_exprs=['(informational && !disabled)'],
+ test_exprs=['(informational && !disabled && '
+ '!"dep:android" && '
+ '!"dep:chrome" && !"dep:chrome_login")'],
ignore_test_failures=True)
parallel_simple(run, machines)