Remove Win Aura bots from the buildbot and tryservers since they're now redundant as trunk Windows …

masters/master.tryserver.chromium/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
 import socket
@@ skipping 661 matching lines @@
     clang=True,
     goma=False,  # TODO(iannucci): Make this use goma.
     ninja=False,  # TODO(iannucci): Employ ninjas.
 )
 
 
 # Windows builder
 win_targets = common_targets[:]
 win_tests = [
   'app_list_unittests_br',
+  'ash_unittests_br',
+  'aura_br',
   'base_unittests_br',
   'blink_platform_unittests_br',
   'browser_tests_br',
   'buildrunner_tests',
   'cacheinvalidation_br',
   'cc_unittests_br',
   'check_deps2git_br',
   'check_deps_br',
   'chrome_frame_br',
   'chromedriver_tests_br',
   'chromedriver2_unittests_br',
   'components_unittests_br',
+  'compositor_br',
   'content_browsertests_br',
   'courgette_br',
   'crypto_br',
   'device_unittests_br',
   'googleurl_br',
   'gpu_br',
   'installer_br',
   'interactive_ui_tests_br',
   'jingle_br',
+  'keyboard_unittests',

[Paweł Hajdan Jr., 2013/11/07 22:22:16]

I think this needs buildrunner (_br) here.

I noticed this is how it used to be before, but it looks suspicious. Maybe a
candidate for TODO? I'll let Mike comment on this.

[ghost stip (do not use), 2013/11/07 22:35:06]

it doesn't need _br, as it was added as a native buildrunner test

[jam, 2013/11/08 01:05:27]

(not doing anything here per stip's comment)

   'media_br',
   'nacl_integration_br',
   'net_br',
   'ppapi_unittests_br',
   'printing_br',
   'remoting_br',
   'sync_integration_br',
   'telemetry_unittests_br',
   'unit_br',
+  'views_br',
   'webkit_compositor_bindings_unittests_br',
   'webkit_lint_br',
   'webkit_unit_br',
   'weborigin_unittests_br',
   'wtf_unittests_br',
 ]
 
 b_win = CreateBuilder(
     target='Debug',
     platform='win32',
@@ skipping 949 matching lines @@
         # CreateBuilder() adds "fastbuild=1" for the other 2 clang bots.
         'gclient_env': {
           'GYP_GENERATORS': 'ninja',
           'GYP_DEFINES': ('chromeos=1'
                           ' clang=1 clang_use_chrome_plugins=1'
                           ' fastbuild=1'
                           ' ffmpeg_branding=ChromeOS proprietary_codecs=1'
                           ' component=shared_library')}})
 }
 
-b_win7_aura = CreateBuilder(
-    platform='win32',
-    target='Release',
-    builder_name='win7_aura',
-    options=['aura_builder'],
-    tests=[
-      'app_list_unittests_br',
-      'ash_unittests_br',
-      'aura_br',
-      'browser_tests_br',
-      'buildrunner_tests',
-      'chrome_frame_net_tests_br',
-      'chrome_frame_tests_br',
-      'chrome_frame_unittests_br',
-      'compositor_br',
-      'content_browsertests_br',
-      'content_unittests_br',
-      'device_unittests_br',
-      'interactive_ui_tests_br',
-      'keyboard_unittests',
-      'unit_unit_br',
-      'views_br',
-    ],
-    goma=True,
-    factory_properties={
-      'gclient_env': {
-        'GYP_DEFINES': 'use_aura=1',
-      },
-    })
-
 # this matches the bot on the main waterfall soon
 b_win8_aura = CreateBuilder(
     platform='win32',
     target='Release',
     builder_name='win8_aura',
     options=['aura_builder'],
     tests=[
       'ash_unittests_br',
       'aura_br',
       'buildrunner_tests',
@@ skipping 481 matching lines @@
   b_linux_chromeos_valgrind,
   b_tsan_linux, b_tsan_win, b_drmemory_win,
   b_linux_layout, b_mac_layout, b_win_layout,
   b_linux_layout_rel, b_mac_layout_rel, b_win_layout_rel,
   b_linux_layout_asan, b_linux_layout_rel_32,
   b_mac_layout_rel_lion, b_mac_layout_rel_mountainlion,
   b_coverage_linux,
   b_win_chrome_frame,
 ] + b_swarms + [
   b_linux_chromeos_clang,
-  b_linux_futura, b_linux_aura, b_win7_aura, b_win8_aura,
+  b_linux_futura, b_linux_aura, b_win8_aura,
   b_linux_asan, b_linux_browser_asan, b_linux_clang_tsan,
   b_linux_chromeos_asan,
   b_mac_asan, b_mac_asan_64, b_mac_xcodebuild,
   b_linux_heapcheck,
   b_linux_redux,
   b_cros_pfq_x86, b_cros_pfq_amd64, b_cros_pfq_daisy,
   b_linux_nacl_sdk, b_win_nacl_sdk, b_mac_nacl_sdk,
   b_linux_nacl_sdk_build, b_win_nacl_sdk_build, b_mac_nacl_sdk_build,
   b_valgrind_mac_alt, b_mac_layout_alt, b_mac_layout_rel_alt,
   b_mac_nacl_sdk_alt,
@@ skipping 180 matching lines @@
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # Buildbot master url:
 if ActiveMaster.is_production_host:
   c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/'
 else:
   c['buildbotURL'] = 'http://%s:%d/' % (
       socket.getfqdn(), ActiveMaster.master_port)
 
 # vi: set ts=4 sts=2 sw=2 et: