Revert "Remove GPU's Linux tests from the CQ."
This reverts commit cb86ee416ec894c59d504acf91d2924617fccd9b.
Reason for revert: Restoring full functionality
Original change's description:
> Remove GPU's Linux tests from the CQ.
>
> The datacenter holding GPU's bots is offline, so these CQ tests are
> stuck. Remove them from the CQ while we work on getting ATL back online.
>
> TBR=gbeaty
>
> No-Try: true
> Bug: 1108842
> Change-Id: I3833475c71d7f79380c22303c989d05baf2fd8fd
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2316438
> Reviewed-by: Haiyang Pan <[email protected]>
> Commit-Queue: Haiyang Pan <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#791275}
[email protected],[email protected],[email protected]
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 1108842
Change-Id: I7da7f5d8bb91a4d9e5f6fe50ca97dbd0be0dbd89
No-Tree-Checks: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2318509
Commit-Queue: Garrett Beaty <[email protected]>
Reviewed-by: Garrett Beaty <[email protected]>
Reviewed-by: Erik Staab <[email protected]>
Reviewed-by: Haiyang Pan <[email protected]>
Cr-Commit-Position: refs/heads/master@{#791433}
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index a9de038..dbd11f5 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -1131,54 +1131,51 @@
'modifications': {
# TODO(kbr): figure out a better way to specify blocks of
# arguments like this for tests on multiple machines.
-
- # TODO(crbug.com/1108842): Add GPU back once ATL capacity is
- # online.
- #'Linux ASan LSan Tests (1)': {
- # 'args': [
- # '--use-gpu-in-tests',
- # '--no-xvfb',
- # ],
- # 'swarming': {
- # 'dimension_sets': [
- # {
- # 'gpu': '10de:1cb3',
- # 'os': 'Ubuntu',
- # 'pool': 'chromium.tests.gpu',
- # },
- # ],
- # },
- #},
- #'Linux CFI': {
- # 'args': [
- # '--use-gpu-in-tests',
- # '--no-xvfb',
- # ],
- # 'swarming': {
- # 'dimension_sets': [
- # {
- # 'gpu': '10de:1cb3',
- # 'os': 'Ubuntu',
- # 'pool': 'chromium.tests.gpu',
- # },
- # ],
- # },
- #},
- #'Linux TSan Tests': {
- # 'args': [
- # '--use-gpu-in-tests',
- # '--no-xvfb',
- # ],
- # 'swarming': {
- # 'dimension_sets': [
- # {
- # 'gpu': '10de:1cb3',
- # 'os': 'Ubuntu',
- # 'pool': 'chromium.tests.gpu',
- # },
- # ],
- # },
- #},
+ 'Linux ASan LSan Tests (1)': {
+ 'args': [
+ '--use-gpu-in-tests',
+ '--no-xvfb',
+ ],
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'gpu': '10de:1cb3',
+ 'os': 'Ubuntu',
+ 'pool': 'chromium.tests.gpu',
+ },
+ ],
+ },
+ },
+ 'Linux CFI': {
+ 'args': [
+ '--use-gpu-in-tests',
+ '--no-xvfb',
+ ],
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'gpu': '10de:1cb3',
+ 'os': 'Ubuntu',
+ 'pool': 'chromium.tests.gpu',
+ },
+ ],
+ },
+ },
+ 'Linux TSan Tests': {
+ 'args': [
+ '--use-gpu-in-tests',
+ '--no-xvfb',
+ ],
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'gpu': '10de:1cb3',
+ 'os': 'Ubuntu',
+ 'pool': 'chromium.tests.gpu',
+ },
+ ],
+ },
+ },
},
},
'gl_tests_validating': {
@@ -1192,54 +1189,51 @@
'modifications': {
# TODO(kbr): figure out a better way to specify blocks of
# arguments like this for tests on multiple machines.
-
- # TODO(crbug.com/1108842): Add GPU back once ATL capacity is
- # online.
- #'Linux ASan LSan Tests (1)': {
- # 'args': [
- # '--use-gpu-in-tests',
- # '--no-xvfb',
- # ],
- # 'swarming': {
- # 'dimension_sets': [
- # {
- # 'gpu': '10de:1cb3',
- # 'os': 'Ubuntu',
- # 'pool': 'chromium.tests.gpu',
- # },
- # ],
- # },
- #},
- #'Linux CFI': {
- # 'args': [
- # '--use-gpu-in-tests',
- # '--no-xvfb',
- # ],
- # 'swarming': {
- # 'dimension_sets': [
- # {
- # 'gpu': '10de:1cb3',
- # 'os': 'Ubuntu',
- # 'pool': 'chromium.tests.gpu',
- # },
- # ],
- # },
- #},
- #'Linux TSan Tests': {
- # 'args': [
- # '--use-gpu-in-tests',
- # '--no-xvfb',
- # ],
- # 'swarming': {
- # 'dimension_sets': [
- # {
- # 'gpu': '10de:1cb3',
- # 'os': 'Ubuntu',
- # 'pool': 'chromium.tests.gpu',
- # },
- # ],
- # },
- #},
+ 'Linux ASan LSan Tests (1)': {
+ 'args': [
+ '--use-gpu-in-tests',
+ '--no-xvfb',
+ ],
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'gpu': '10de:1cb3',
+ 'os': 'Ubuntu',
+ 'pool': 'chromium.tests.gpu',
+ },
+ ],
+ },
+ },
+ 'Linux CFI': {
+ 'args': [
+ '--use-gpu-in-tests',
+ '--no-xvfb',
+ ],
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'gpu': '10de:1cb3',
+ 'os': 'Ubuntu',
+ 'pool': 'chromium.tests.gpu',
+ },
+ ],
+ },
+ },
+ 'Linux TSan Tests': {
+ 'args': [
+ '--use-gpu-in-tests',
+ '--no-xvfb',
+ ],
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'gpu': '10de:1cb3',
+ 'os': 'Ubuntu',
+ 'pool': 'chromium.tests.gpu',
+ },
+ ],
+ },
+ },
'android-marshmallow-x86-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.gl_tests.filter',
