Modify Win7 Nvidia GPU bot configurations.

There isn't enough Win7 Nvidia GPU bot capacity to run everything on the
waterfall and allow running manually triggered try jobs. This CL removes
the debug configurations "Win7 FYI Debug (NVIDIA)" and "Win7 FYI x64
Debug (NVIDIA)" from chromium.gpu.fyi waterfall. This CL also increases
the execution timeout for the remaining Win7 Nvidia GPU bots.

Bug: 838895
Tbr: jbudorick@chromium.org
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ia3934d51384de411dbd2e9106213833437b84780
Reviewed-on: https://chromium-review.googlesource.com/1053103
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557751}

content/test/gpu/generate_buildbot_json.py

@@ -288,18 +288,6 @@ FYI_WATERFALL = {
       'os_type': 'win',
       'use_gpu_trigger_script': True,
     },
-    'Win7 FYI Debug (NVIDIA)': {
-      'swarming_dimensions': [
-        {
-          'gpu': WIN7_NVIDIA_QUADRO_P400_STABLE_DRIVER,
-          'os': 'Windows-2008ServerR2-SP1',
-          'pool': 'Chrome-GPU',
-        },
-      ],
-      'build_config': 'Debug',
-      'swarming': True,
-      'os_type': 'win',
-    },
     'Win10 FYI dEQP Release (NVIDIA)': {
       'swarming_dimensions': [
         {
@@ -428,18 +416,6 @@ FYI_WATERFALL = {
       'swarming': True,
       'os_type': 'win',
     },
-    'Win7 FYI x64 Debug (NVIDIA)': {
-      'swarming_dimensions': [
-        {
-          'gpu': WIN7_NVIDIA_QUADRO_P400_STABLE_DRIVER,
-          'os': 'Windows-2008ServerR2-SP1',
-          'pool': 'Chrome-GPU',
-        },
-      ],
-      'build_config': 'Debug_x64',
-      'swarming': True,
-      'os_type': 'win',
-    },
     'Win7 FYI x64 dEQP Release (NVIDIA)': {
       'swarming_dimensions': [
         {
@@ -2300,10 +2276,6 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
         'names': [
           'Linux FYI Ozone (Intel)',
 
-          # http://crbug.com/599451: this test is currently too slow
-          # to run on x64 in Debug mode. Need to shard the tests.
-          'Win7 FYI x64 Debug (NVIDIA)',
-
           # The Mac NVIDIA Retina bots don't have the capacity to run
           # this test suite on mac_optional_gpu_tests_rel.
           'Optional Mac Retina Release (NVIDIA)',

infra/config/global/cr-buildbucket.cfg

@@ -1173,10 +1173,6 @@ buckets {
       name: "Win7 FYI Debug (AMD)"
       mixins: "win-gpu-fyi-ci"
     }
-    builders {
-      name: "Win7 FYI Debug (NVIDIA)"
-      mixins: "win-gpu-fyi-ci"
-    }
     builders {
       name: "Win7 FYI dEQP Release (AMD)"
       mixins: "win-gpu-fyi-ci"
@@ -1188,18 +1184,17 @@ buckets {
     builders {
       name: "Win7 FYI Release (NVIDIA)"
       mixins: "win-gpu-fyi-ci"
-    }
-    builders {
-      name: "Win7 FYI x64 Debug (NVIDIA)"
-      mixins: "win-gpu-fyi-ci"
+      execution_timeout_secs: 10800  # 3h
     }
     builders {
       name: "Win7 FYI x64 dEQP Release (NVIDIA)"
       mixins: "win-gpu-fyi-ci"
+      execution_timeout_secs: 10800  # 3h
     }
     builders {
       name: "Win7 FYI x64 Release (NVIDIA)"
       mixins: "win-gpu-fyi-ci"
+      execution_timeout_secs: 10800  # 3h
     }
   }
 }
@@ -1495,7 +1490,11 @@ buckets {
     builders { mixins: "mac-try" name: "mac_upload_clang" }
     builders { mixins: "mac-try" name: "mac-views-rel" }
 
-    builders { mixins: "win-optional-gpu-try" name: "gpu_manual_try_win7_nvidia_rel" }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu_manual_try_win7_nvidia_rel"
+      execution_timeout_secs: 10800  # 3h
+    }
     builders { mixins: "win-try" name: "win10_chromium_x64_dbg_ng" }
     builders { mixins: "win-try" name: "win10_chromium_x64_rel_ng" }
     builders { mixins: "win-try" name: "win10_chromium_x64_rel_ng_exp" }

infra/config/global/luci-milo-dev.cfg

@@ -2497,11 +2497,6 @@ consoles: {
     category: "Windows|7|AMD"
     short_name: "rel"
   }
-  builders: {
-    name: "buildbot/chromium.gpu.fyi/Win7 FYI Debug (NVIDIA)"
-    category: "Windows|7|Nvidia"
-    short_name: "dbg"
-  }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win10 FYI Exp Release (NVIDIA)"
     category: "Windows|10|Nvidia"
@@ -2517,11 +2512,6 @@ consoles: {
     category: "Windows|10|Nvidia"
     short_name: "dqp"
   }
-  builders: {
-    name: "buildbot/chromium.gpu.fyi/Win7 FYI x64 Debug (NVIDIA)"
-    category: "Windows|7|Nvidia|x64"
-    short_name: "dbg"
-  }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win7 FYI x64 Release (NVIDIA)"
     category: "Windows|7|Nvidia|x64"

infra/config/global/luci-milo.cfg

@@ -3002,11 +3002,6 @@ consoles {
     category: "Windows|7|AMD"
     short_name: "rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Win7 FYI Debug (NVIDIA)"
-    category: "Windows|7|Nvidia"
-    short_name: "dbg"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Win10 FYI Exp Release (NVIDIA)"
     category: "Windows|10|Nvidia"
@@ -3022,11 +3017,6 @@ consoles {
     category: "Windows|10|Nvidia"
     short_name: "dqp"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Win7 FYI x64 Debug (NVIDIA)"
-    category: "Windows|7|Nvidia|x64"
-    short_name: "dbg"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Win7 FYI x64 Release (NVIDIA)"
     category: "Windows|7|Nvidia|x64"

infra/config/global/luci-scheduler.cfg

@@ -1533,17 +1533,6 @@ job {
   }
 }
 
-job {
-  id: "Win7 FYI Debug (NVIDIA)"
-  # Triggered by "GPU FYI Win Builder (dbg)"
-  acl_sets: "triggered-by-parent-builders"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Win7 FYI Debug (NVIDIA)"
-  }
-}
-
 job {
   id: "GPU FYI Win Clang Builder (dbg)"
   acl_sets: "default"
@@ -1617,17 +1606,6 @@ job {
   }
 }
 
-job {
-  id: "Win7 FYI x64 Debug (NVIDIA)"
-  # Triggered by "GPU FYI Win x64 Builder (dbg)"
-  acl_sets: "triggered-by-parent-builders"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Win7 FYI x64 Debug (NVIDIA)"
-  }
-}
-
 job {
   id: "GPU FYI Win x64 dEQP Builder"
   acl_sets: "default"