Add AU N-to-N tests to their own suite.
am: eaa785b4d1
Change-Id: Ib5572127bba41a8de899e0eda5cc48b188d3d52a
diff --git a/client/site_tests/autoupdate_EOL/control b/client/site_tests/autoupdate_EOL/control
index 971c6f6..6568bb5 100644
--- a/client/site_tests/autoupdate_EOL/control
+++ b/client/site_tests/autoupdate_EOL/control
@@ -7,7 +7,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "client"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
PURPOSE = "Tests End of Life (EOL) / Autoupdate Expiration (AUE)"
TIME = "SHORT"
diff --git a/server/site_tests/autoupdate_CatchBadSignatures/control b/server/site_tests/autoupdate_CatchBadSignatures/control
index 7d85454..d82adc3 100644
--- a/server/site_tests/autoupdate_CatchBadSignatures/control
+++ b/server/site_tests/autoupdate_CatchBadSignatures/control
@@ -12,7 +12,7 @@
TEST_TYPE = "server"
JOB_RETRIES = 2
# TODO(jorgelo): move this to bvt-cq after crbug.com/427384 is fixed.
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
BUG_TEMPLATE = {
'cc': ['chromeos-installer-alerts@google.com'],
'components': ['Internals>Installer'],
diff --git a/server/site_tests/autoupdate_ForcedOOBEUpdate/control.delta b/server/site_tests/autoupdate_ForcedOOBEUpdate/control.delta
index f533a5c..090a135 100644
--- a/server/site_tests/autoupdate_ForcedOOBEUpdate/control.delta
+++ b/server/site_tests/autoupdate_ForcedOOBEUpdate/control.delta
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
DOC = """
This tests the forced autoupdate flow at OOBE.
diff --git a/server/site_tests/autoupdate_ForcedOOBEUpdate/control.full b/server/site_tests/autoupdate_ForcedOOBEUpdate/control.full
index fb0660a..7e9da05 100644
--- a/server/site_tests/autoupdate_ForcedOOBEUpdate/control.full
+++ b/server/site_tests/autoupdate_ForcedOOBEUpdate/control.full
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
DOC = """
This tests the forced autoupdate flow at OOBE.
diff --git a/server/site_tests/autoupdate_ForcedOOBEUpdate/control.interrupt.full b/server/site_tests/autoupdate_ForcedOOBEUpdate/control.interrupt.full
index 244050f..07fac53 100644
--- a/server/site_tests/autoupdate_ForcedOOBEUpdate/control.interrupt.full
+++ b/server/site_tests/autoupdate_ForcedOOBEUpdate/control.interrupt.full
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
DOC = """
This tests the forced autoupdate flow at OOBE with interruptions.
diff --git a/server/site_tests/autoupdate_Interruptions/control.full b/server/site_tests/autoupdate_Interruptions/control.full
index 489864c..8bffadf 100644
--- a/server/site_tests/autoupdate_Interruptions/control.full
+++ b/server/site_tests/autoupdate_Interruptions/control.full
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
DOC = """
Tests using the chromebook during an update.
diff --git a/server/site_tests/autoupdate_NonBlockingOOBEUpdate/control.delta b/server/site_tests/autoupdate_NonBlockingOOBEUpdate/control.delta
index 14aaa60..e0b3971 100644
--- a/server/site_tests/autoupdate_NonBlockingOOBEUpdate/control.delta
+++ b/server/site_tests/autoupdate_NonBlockingOOBEUpdate/control.delta
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
DOC = """
This tests an update is available at OOBE but there is no deadline set.
diff --git a/server/site_tests/autoupdate_OmahaResponse/control.backoff_disabled.full b/server/site_tests/autoupdate_OmahaResponse/control.backoff_disabled.full
index c5bada3..d31e23d 100644
--- a/server/site_tests/autoupdate_OmahaResponse/control.backoff_disabled.full
+++ b/server/site_tests/autoupdate_OmahaResponse/control.backoff_disabled.full
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
DOC = """
Test we can update when we fail the first attempt and backoff is disabled.
"""
diff --git a/server/site_tests/autoupdate_OmahaResponse/control.backoff_enabled.full b/server/site_tests/autoupdate_OmahaResponse/control.backoff_enabled.full
index 35f6d66..d2fc6f5 100644
--- a/server/site_tests/autoupdate_OmahaResponse/control.backoff_enabled.full
+++ b/server/site_tests/autoupdate_OmahaResponse/control.backoff_enabled.full
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
DOC = """
Test we cannot update when we fail the first attempt and backoff is enabled.
"""
diff --git a/server/site_tests/autoupdate_OmahaResponse/control.bad_metadata_size.full b/server/site_tests/autoupdate_OmahaResponse/control.bad_metadata_size.full
index b624737..30c562f 100644
--- a/server/site_tests/autoupdate_OmahaResponse/control.bad_metadata_size.full
+++ b/server/site_tests/autoupdate_OmahaResponse/control.bad_metadata_size.full
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
DOC = """
Tests that an update fails when the metadata size value is invalid.
"""
diff --git a/server/site_tests/autoupdate_OmahaResponse/control.bad_sha256.full b/server/site_tests/autoupdate_OmahaResponse/control.bad_sha256.full
index 6850a3d..12475ae 100644
--- a/server/site_tests/autoupdate_OmahaResponse/control.bad_sha256.full
+++ b/server/site_tests/autoupdate_OmahaResponse/control.bad_sha256.full
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
DOC = """
Tests that an update fails when the SHA256 value is invalid.
"""
diff --git a/server/site_tests/autoupdate_OmahaResponse/control.url_switch.full b/server/site_tests/autoupdate_OmahaResponse/control.url_switch.full
index cc588ba..4ca8b98 100644
--- a/server/site_tests/autoupdate_OmahaResponse/control.url_switch.full
+++ b/server/site_tests/autoupdate_OmahaResponse/control.url_switch.full
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
DOC = """
This tests that we move to the second Url when we fail with the first Url.
"""
diff --git a/server/site_tests/autoupdate_P2P/control.deadline_expired.delta b/server/site_tests/autoupdate_P2P/control.deadline_expired.delta
index 87c37dc..350663d 100644
--- a/server/site_tests/autoupdate_P2P/control.deadline_expired.delta
+++ b/server/site_tests/autoupdate_P2P/control.deadline_expired.delta
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
SYNC_COUNT = 2
DOC = """
This tests autoupdate between two devices via peer to peer is disabled when
diff --git a/server/site_tests/autoupdate_P2P/control.delta b/server/site_tests/autoupdate_P2P/control.delta
index 04edb20..d7a6a6a 100644
--- a/server/site_tests/autoupdate_P2P/control.delta
+++ b/server/site_tests/autoupdate_P2P/control.delta
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
SYNC_COUNT = 2
DOC = """
This tests autoupdate between two devices via peer to peer.
diff --git a/server/site_tests/autoupdate_P2P/control.too_many_attempts.delta b/server/site_tests/autoupdate_P2P/control.too_many_attempts.delta
index 4454ed1..752ec8d 100644
--- a/server/site_tests/autoupdate_P2P/control.too_many_attempts.delta
+++ b/server/site_tests/autoupdate_P2P/control.too_many_attempts.delta
@@ -9,7 +9,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:au-perbuild"
SYNC_COUNT = 2
DOC = """
This tests autoupdate between two devices via peer to peer is disabled when
diff --git a/server/site_tests/autoupdate_Rollback/control.powerwash_before_rollback b/server/site_tests/autoupdate_Rollback/control.powerwash_before_rollback
index 7721a83..be073e4 100644
--- a/server/site_tests/autoupdate_Rollback/control.powerwash_before_rollback
+++ b/server/site_tests/autoupdate_Rollback/control.powerwash_before_rollback
@@ -10,7 +10,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
+ATTRIBUTES = "suite:bvt-installer"
DOC = """
This is a rollback test for Chrome OS releases. It first updates a machine and
diff --git a/site_utils/attribute_whitelist.txt b/site_utils/attribute_whitelist.txt
index b679dcc..c4474d6 100644
--- a/site_utils/attribute_whitelist.txt
+++ b/site_utils/attribute_whitelist.txt
@@ -39,6 +39,7 @@
suite:arc-gts-test
suite:arc-unit-test
suite:audio
+suite:au-perbuild
suite:av_webcam
suite:bluestreak-partners
suite:bluestreak-pre-cq
diff --git a/test_suites/control.au-perbuild b/test_suites/control.au-perbuild
new file mode 100644
index 0000000..9bcaa75
--- /dev/null
+++ b/test_suites/control.au-perbuild
@@ -0,0 +1,25 @@
+# Copyright 2019 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 = "David Haddock <dhaddock@chromium.org>"
+NAME = "au-perbuild"
+PURPOSE = "Suite for autoupdate N-to-N tests."
+TIME = "SHORT"
+TEST_CATEGORY = "Functional"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+This suite runs the N-to-N autoupdate tests.
+"""
+
+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'] = 60
+args_dict['job'] = job
+
+dynamic_suite.reimage_and_run(**args_dict)
