graphics_dEQP: move to bvt-cq.
dEQP replaces Piglit in the bvt-cq. All these tests are currently
green on wmatrix and sharded into roughly 1 minute chunks.
BUG=chromium:510208
TEST=wmatrix
Change-Id: I87ad447bc518324b1dc879c82621654318e15637
Reviewed-on: https://chromium-review.googlesource.com/306779
Commit-Ready: Ilja Friedel <ihf@chromium.org>
Tested-by: Ilja Friedel <ihf@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
diff --git a/client/site_tests/graphics_dEQP/control.gles2.accuracy b/client/site_tests/graphics_dEQP/control.gles2.accuracy
index 7616126..6f6dcdb 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.accuracy
+++ b/client/site_tests/graphics_dEQP/control.gles2.accuracy
@@ -8,8 +8,8 @@
CRITERIA = """
All of the individual tests must pass.
"""
-ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
DEPENDENCIES = 'cleanup-reboot'
TIME = 'FAST'
TEST_CATEGORY = 'Functional'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.capability b/client/site_tests/graphics_dEQP/control.gles2.capability
index c67d314..7614ee8 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.capability
+++ b/client/site_tests/graphics_dEQP/control.gles2.capability
@@ -8,8 +8,8 @@
CRITERIA = """
All of the individual tests must pass.
"""
-ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
DEPENDENCIES = 'cleanup-reboot'
TIME = 'FAST'
TEST_CATEGORY = 'Functional'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty
index fdb0653..d1f4362 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty
@@ -8,8 +8,8 @@
CRITERIA = """
All of the individual tests must pass.
"""
-ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system'
+SUITE = 'graphics_per-day, graphics_system'
DEPENDENCIES = 'cleanup-reboot'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.0 b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.0
index 45d1ed9..9abef9f 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.0
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.0
@@ -7,8 +7,8 @@
AUTHOR = 'chromeos-gfx'
PURPOSE = 'Run the drawElements Quality Program test suite in hasty mode.'
CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild'
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.1 b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.1
index 09c16cd..f85200b 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.1
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.1
@@ -7,8 +7,8 @@
AUTHOR = 'chromeos-gfx'
PURPOSE = 'Run the drawElements Quality Program test suite in hasty mode.'
CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild'
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.2 b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.2
index 8f64469..8b15cae 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.2
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.2
@@ -7,8 +7,8 @@
AUTHOR = 'chromeos-gfx'
PURPOSE = 'Run the drawElements Quality Program test suite in hasty mode.'
CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild'
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.3 b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.3
index f50b03c..25cdf8a 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.3
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.3
@@ -7,8 +7,8 @@
AUTHOR = 'chromeos-gfx'
PURPOSE = 'Run the drawElements Quality Program test suite in hasty mode.'
CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild'
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.4 b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.4
index 51bfcbb..db5696a 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.4
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.4
@@ -7,8 +7,8 @@
AUTHOR = 'chromeos-gfx'
PURPOSE = 'Run the drawElements Quality Program test suite in hasty mode.'
CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild'
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.5 b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.5
index cd4a92f..2d17f39 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.5
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.5
@@ -7,8 +7,8 @@
AUTHOR = 'chromeos-gfx'
PURPOSE = 'Run the drawElements Quality Program test suite in hasty mode.'
CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild'
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.6 b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.6
index e7e6c5d..bb55384 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.6
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.6
@@ -7,8 +7,8 @@
AUTHOR = 'chromeos-gfx'
PURPOSE = 'Run the drawElements Quality Program test suite in hasty mode.'
CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild'
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.7 b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.7
index 2b74838..1e4a91c 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.7
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.7
@@ -7,8 +7,8 @@
AUTHOR = 'chromeos-gfx'
PURPOSE = 'Run the drawElements Quality Program test suite in hasty mode.'
CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild'
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.8 b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.8
index dfa929e..91c5f1b 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.8
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.8
@@ -7,8 +7,8 @@
AUTHOR = 'chromeos-gfx'
PURPOSE = 'Run the drawElements Quality Program test suite in hasty mode.'
CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild'
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.9 b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.9
index 6e0491c..f9ad8ac 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.9
+++ b/client/site_tests/graphics_dEQP/control.gles2.functional.hasty.9
@@ -7,8 +7,8 @@
AUTHOR = 'chromeos-gfx'
PURPOSE = 'Run the drawElements Quality Program test suite in hasty mode.'
CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild'
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = 'graphics'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.info b/client/site_tests/graphics_dEQP/control.gles2.info
index 47bc126..ad06299 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.info
+++ b/client/site_tests/graphics_dEQP/control.gles2.info
@@ -8,8 +8,8 @@
CRITERIA = """
All of the individual tests must pass.
"""
-ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
DEPENDENCIES = 'cleanup-reboot'
TIME = 'FAST'
TEST_CATEGORY = 'Functional'
diff --git a/client/site_tests/graphics_dEQP/control.gles2.stress b/client/site_tests/graphics_dEQP/control.gles2.stress
index 66d090f..c21a5f7 100644
--- a/client/site_tests/graphics_dEQP/control.gles2.stress
+++ b/client/site_tests/graphics_dEQP/control.gles2.stress
@@ -8,8 +8,8 @@
CRITERIA = """
All of the individual tests must pass.
"""
-ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
DEPENDENCIES = 'cleanup-reboot'
TIME = 'LENGTHY'
TEST_CATEGORY = 'Stress'
diff --git a/client/site_tests/graphics_dEQP/control.gles3.accuracy b/client/site_tests/graphics_dEQP/control.gles3.accuracy
index aa31077..2b259a1 100644
--- a/client/site_tests/graphics_dEQP/control.gles3.accuracy
+++ b/client/site_tests/graphics_dEQP/control.gles3.accuracy
@@ -8,8 +8,8 @@
CRITERIA = """
All of the individual tests must pass.
"""
-ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
DEPENDENCIES = 'cleanup-reboot'
TIME = 'FAST'
TEST_CATEGORY = 'Functional'
diff --git a/client/site_tests/graphics_dEQP/control.gles3.info b/client/site_tests/graphics_dEQP/control.gles3.info
index 5f5a620..54c8fff 100644
--- a/client/site_tests/graphics_dEQP/control.gles3.info
+++ b/client/site_tests/graphics_dEQP/control.gles3.info
@@ -8,8 +8,8 @@
CRITERIA = """
All of the individual tests must pass.
"""
-ATTRIBUTES = "suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild"
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
DEPENDENCIES = 'cleanup-reboot'
TIME = 'FAST'
TEST_CATEGORY = 'Functional'
diff --git a/client/site_tests/graphics_dEQP/generate_controlfiles.py b/client/site_tests/graphics_dEQP/generate_controlfiles.py
index c3b3015..9b7296a 100755
--- a/client/site_tests/graphics_dEQP/generate_controlfiles.py
+++ b/client/site_tests/graphics_dEQP/generate_controlfiles.py
@@ -15,8 +15,8 @@
AUTHOR = 'chromeos-gfx'
PURPOSE = 'Run the drawElements Quality Program test suite in hasty mode.'
CRITERIA = 'All of the individual tests must pass.'
-ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-perbuild'
-SUITE = 'graphics_per-day, graphics_system, bvt-perbuild'
+ATTRIBUTES = 'suite:graphics_per-day, suite:graphics_system, suite:bvt-cq'
+SUITE = 'graphics_per-day, graphics_system, bvt-cq'
TIME = 'MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = 'graphics'
