From a3a80b69082f413a6849c979b35dad0e69cb9d48 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Wed, 14 Mar 2018 14:16:04 -0400 Subject: [PATCH] presubmit_unittest.py: use LUCI for the optional GPU tests on Linux TBR=maruel@chromium.org BUG=chromium:815092 Change-Id: I2d9e63000cbe48fea636a3d0f6fd69f040495697 Reviewed-on: https://chromium-review.googlesource.com/962994 Reviewed-by: Robbie Iannucci Commit-Queue: Robbie Iannucci Commit-Queue: Corentin Wallez --- tests/presubmit_unittest.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py index d1cab3a604..80a0d058dd 100755 --- a/tests/presubmit_unittest.py +++ b/tests/presubmit_unittest.py @@ -1523,23 +1523,23 @@ class OutputApiUnittest(PresubmitTestsBase): CQ_INCLUDE_TRYBOTS= master.tryserver.blink:linux_trusty_blink_rel ;master.tryserver.chromium.win:win_optional_gpu_tests_rel """, [ - 'master.tryserver.chromium.linux:linux_optional_gpu_tests_rel', + 'luci.chromium.try:linux_optional_gpu_tests_rel', 'master.tryserver.chromium.win:win_optional_gpu_tests_rel' ], """A change to GPU-related code. -CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel +CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel """) # Starting without any CQ_INCLUDE_TRYBOTS line. self._testIncludingCQTrybots( """A change to GPU-related code.""", [ - 'master.tryserver.chromium.linux:linux_optional_gpu_tests_rel', + 'luci.chromium.try:linux_optional_gpu_tests_rel', 'master.tryserver.chromium.mac:mac_optional_gpu_tests_rel', ], """A change to GPU-related code. -CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel +CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel """) # All pre-existing bots are already in output set. @@ -1549,12 +1549,12 @@ CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel; CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.win:win_optional_gpu_tests_rel """, [ - 'master.tryserver.chromium.linux:linux_optional_gpu_tests_rel', + 'luci.chromium.try:linux_optional_gpu_tests_rel', 'master.tryserver.chromium.win:win_optional_gpu_tests_rel' ], """A change to GPU-related code. -CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel +CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel """) # Equivalent tests for Gerrit (pre-existing Change-Id line). @@ -1563,43 +1563,43 @@ CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel; Change-Id: Idaeacea9cdbe912c24c8388147a8a767c7baa5f2""", [ - 'master.tryserver.chromium.linux:linux_optional_gpu_tests_rel', + 'luci.chromium.try:linux_optional_gpu_tests_rel', 'master.tryserver.chromium.mac:mac_optional_gpu_tests_rel', ], """A change to GPU-related code. -Cq-Include-Trybots: master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel +Cq-Include-Trybots: luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel Change-Id: Idaeacea9cdbe912c24c8388147a8a767c7baa5f2""", is_gerrit=True) self._testIncludingCQTrybots( """A change to GPU-related code. -Cq-Include-Trybots: master.tryserver.chromium.linux:linux_optional_gpu_tests_rel +Cq-Include-Trybots: luci.chromium.try:linux_optional_gpu_tests_rel Change-Id: Idaeacea9cdbe912c24c8388147a8a767c7baa5f2 """, [ - 'master.tryserver.chromium.linux:linux_optional_gpu_tests_rel', + 'luci.chromium.try:linux_optional_gpu_tests_rel', 'master.tryserver.chromium.win:win_optional_gpu_tests_rel', ], """A change to GPU-related code. -Cq-Include-Trybots: master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel +Cq-Include-Trybots: luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Change-Id: Idaeacea9cdbe912c24c8388147a8a767c7baa5f2""", is_gerrit=True) self._testIncludingCQTrybots( """A change to GPU-related code. -Cq-Include-Trybots: master.tryserver.chromium.linux:linux_optional_gpu_tests_rel -Cq-Include-Trybots: master.tryserver.chromium.linux:linux_optional_gpu_tests_dbg +Cq-Include-Trybots: luci.chromium.try:linux_optional_gpu_tests_rel +Cq-Include-Trybots: luci.chromium.try:linux_optional_gpu_tests_dbg Change-Id: Idaeacea9cdbe912c24c8388147a8a767c7baa5f2 """, [ - 'master.tryserver.chromium.linux:linux_optional_gpu_tests_rel', + 'luci.chromium.try:linux_optional_gpu_tests_rel', 'master.tryserver.chromium.win:win_optional_gpu_tests_rel', ], """A change to GPU-related code. -Cq-Include-Trybots: master.tryserver.chromium.linux:linux_optional_gpu_tests_dbg;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel +Cq-Include-Trybots: luci.chromium.try:linux_optional_gpu_tests_dbg;luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Change-Id: Idaeacea9cdbe912c24c8388147a8a767c7baa5f2""", is_gerrit=True)