autotest: remove cr50_stress_flaky
cr50_stress_experimental is the cr50 experimental suite. Remove
cr50_stress_flaky and move tests to cr50_stress_experimental.
BUG=none
BRANCH=none
TEST=none
Change-Id: Ia02c28cea3bdfefc1ea90b25405455f7a64534ce
Signed-off-by: Mary Ruthven <mruthven@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1529964
Commit-Ready: Mary Ruthven <mruthven@chromium.org>
Tested-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Kevin Shelton <kmshelton@chromium.org>
diff --git a/server/site_tests/firmware_Cr50BID/control b/server/site_tests/firmware_Cr50BID/control
index 32aff90..2d220c9 100644
--- a/server/site_tests/firmware_Cr50BID/control
+++ b/server/site_tests/firmware_Cr50BID/control
@@ -7,7 +7,7 @@
AUTHOR = "mruthven"
NAME = "firmware_Cr50BID"
PURPOSE = "Verify cr50 response to board id"
-ATTRIBUTES = "suite:cr50_stress_flaky"
+ATTRIBUTES = "suite:cr50_stress_experimental"
TIME = "LONG"
TEST_TYPE = "server"
DEPENDENCIES = "servo"
diff --git a/server/site_tests/firmware_Cr50GetName/control b/server/site_tests/firmware_Cr50GetName/control
index 310772d..f9bc9cf 100644
--- a/server/site_tests/firmware_Cr50GetName/control
+++ b/server/site_tests/firmware_Cr50GetName/control
@@ -7,7 +7,7 @@
AUTHOR = "mruthven"
NAME = "firmware_Cr50GetName"
PURPOSE = "Verify cr50-get-name"
-ATTRIBUTES = "suite:cr50_stress_flaky"
+ATTRIBUTES = "suite:cr50_stress_experimental"
TIME = "MEDIUM"
TEST_TYPE = "server"
DEPENDENCIES = "servo"
diff --git a/server/site_tests/firmware_Cr50SetBoardId/control b/server/site_tests/firmware_Cr50SetBoardId/control
index 8fa4e1c..d70024d 100644
--- a/server/site_tests/firmware_Cr50SetBoardId/control
+++ b/server/site_tests/firmware_Cr50SetBoardId/control
@@ -7,7 +7,7 @@
AUTHOR = "mruthven"
NAME = "firmware_Cr50SetBoardId"
PURPOSE = "Verify cr50-set-board-id"
-ATTRIBUTES = "suite:cr50_stress_flaky"
+ATTRIBUTES = "suite:cr50_stress_experimental"
TIME = "MEDIUM"
TEST_TYPE = "server"
DEPENDENCIES = "servo"
diff --git a/server/site_tests/firmware_Cr50Update/control b/server/site_tests/firmware_Cr50Update/control
index c85c386..72d73c8 100644
--- a/server/site_tests/firmware_Cr50Update/control
+++ b/server/site_tests/firmware_Cr50Update/control
@@ -5,7 +5,7 @@
AUTHOR = "mruthven"
NAME = "firmware_Cr50Update"
PURPOSE = "Verify Cr50 update"
-ATTRIBUTES = "suite:cr50_stress_flaky"
+ATTRIBUTES = "suite:cr50_stress_experimental"
TIME = "SHORT"
TEST_TYPE = "server"
DEPENDENCIES = "servo"
diff --git a/server/site_tests/firmware_Cr50Update/control.post_install b/server/site_tests/firmware_Cr50Update/control.post_install
index 5eb6069..d4503b6 100644
--- a/server/site_tests/firmware_Cr50Update/control.post_install
+++ b/server/site_tests/firmware_Cr50Update/control.post_install
@@ -5,7 +5,7 @@
AUTHOR = "mruthven"
NAME = "firmware_Cr50Update.post_install"
PURPOSE = "Verify Cr50 update"
-ATTRIBUTES = "suite:cr50_stress_flaky"
+ATTRIBUTES = "suite:cr50_stress_experimental"
TIME = "SHORT"
TEST_TYPE = "server"
DEPENDENCIES = "servo"
diff --git a/site_utils/attribute_whitelist.txt b/site_utils/attribute_whitelist.txt
index c4474d6..d487234 100644
--- a/site_utils/attribute_whitelist.txt
+++ b/site_utils/attribute_whitelist.txt
@@ -80,7 +80,6 @@
suite:check_setup_storage_qual
suite:chrome-informational
suite:cr50_stress_experimental
-suite:cr50_stress_flaky
suite:crosbolt_arc_perf_nightly
suite:crosbolt_arc_perf_perbuild
suite:crosbolt_perf_nightly
diff --git a/test_suites/control.cr50_stress_flaky b/test_suites/control.cr50_stress_flaky
deleted file mode 100644
index bf07607..0000000
--- a/test_suites/control.cr50_stress_flaky
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2017 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 = "Chrome OS Team"
-NAME = "cr50_stress_flaky"
-PURPOSE = "Experimental suite to test cr50 stress tests."
-
-TIME = "LONG"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the cr50_stress_flaky test suite.
-
-This suite is meant to be a proving ground for cr50 stress tests before they
-are promoted to the actual cr50 stress experimental suite. Specifically for
-tests that may leave the device in a bad state. The tests should remain in
-only this suite until the test reliably restores the Cr50 state.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'cr50_stress_flaky'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)