commit f05a7394c8a6a9dbf235bda9a1ea5dd6c1085d2b
author Kenneth Russell <kbr@chromium.org> Wed Feb 21 20:53:16 2018
committer Commit Bot <commit-bot@chromium.org> Wed Feb 21 20:53:16 2018
tree fbf8242c3f93aba1c7f270e0ac568bcb3be32c80
parent 1a55d47f4945223f686bece5201af4c3c7dcc94b

Remove all tests from android_optional_gpu_tests_rel.

android_n5x_swarming_rel currently runs all of the tests that this
optional tryserver used to.

TBR=ynovikov@chromium.org
NOTRY=true

Bug: 786572
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ie0c6e858801a92883cbb2356a93428d05ce0097b
Reviewed-on: https://chromium-review.googlesource.com/929543
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#538203}

content/test/gpu/generate_buildbot_json.py

diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
index d2f862b..398f74d 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -118,10 +118,6 @@
   def EXPERIMENTAL_CONDITIONALLY(x):
     return Types.EXPERIMENTAL in x
 
-  @staticmethod
-  def EXPERIMENTAL_CONDITIONALLY_OR_NOOP(x):
-    return Types.EXPERIMENTAL in x or Types.NOOP in x
-
 # Most of the bots live in the Chrome-GPU pool as defined here (Google
 # employees only, sorry):
 # https://chrome-internal.googlesource.com/infradata/config/+/master/configs/
@@ -1975,7 +1971,7 @@
     'tester_configs': [
       {
         # Only run the noop sleep test on experimental configs.
-        'predicate': Predicates.EXPERIMENTAL_CONDITIONALLY_OR_NOOP,
+        'predicate': Predicates.EXPERIMENTAL_CONDITIONALLY,
         'disabled_instrumentation_types': ['tsan'],
       },
     ],
@@ -2596,8 +2592,7 @@
   if 'tester_configs' in test_config:
     for tc in test_config['tester_configs']:
       pred = tc.get('predicate', Predicates.DEFAULT)
-      if (pred == Predicates.EXPERIMENTAL_CONDITIONALLY or \
-          pred == Predicates.EXPERIMENTAL_CONDITIONALLY_OR_NOOP):
+      if pred == Predicates.EXPERIMENTAL_CONDITIONALLY:
         return True
   return False
 

testing/buildbot/chromium.gpu.fyi.json

diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json
index ae829af..a84328cb 100644
--- a/testing/buildbot/chromium.gpu.fyi.json
+++ b/testing/buildbot/chromium.gpu.fyi.json
@@ -9960,33 +9960,7 @@
   },
   "Optional Android Release (Nexus 5X)": {
     "gtest_tests": [],
-    "isolated_scripts": [
-      {
-        "args": [
-          "noop_sleep",
-          "--show-stdout",
-          "--browser=android-chromium",
-          "--passthrough",
-          "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "noop_sleep_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "device_os": "MMB29Q",
-              "device_type": "bullhead",
-              "os": "Android"
-            }
-          ]
-        }
-      }
-    ]
+    "isolated_scripts": []
   },
   "Optional Linux Release (Intel HD 630)": {
     "gtest_tests": [