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

masters/master.chromium.win/master_win_cfg.py

 # 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.
 
 from master import master_config
 from master.factory import chromium_factory
 
 defaults = {}
 
 helper = master_config.Helper(defaults)
@@ skipping 108 matching lines @@
                         'browser_total_shards': 3, 'browser_shard_index': 1,
                         'start_crash_handler': True,
                         'generate_gtest_json': True}))
 
 B('XP Tests (2)', 'rel_unit_2', 'testers|windows', 'win_rel_trigger',
   notify_on_missing=True)
 F('rel_unit_2', win_tester().ChromiumFactory(
     slave_type='Tester',
     build_url=rel_archive,
     tests=[
+      'ash_unittests',
+      'aura',
       'base_unittests',
       'browser_tests',
+      'compositor',
       'net',
       'telemetry_unittests',
+      'views_unittests',
     ],
     factory_properties={'process_dumps': True,
                         'sharded_tests': sharded_tests,
                         'browser_total_shards': 3, 'browser_shard_index': 2,
                         'start_crash_handler': True,
                         'generate_gtest_json': True}))
 
 B('XP Tests (3)', 'rel_unit_3', 'testers|windows', 'win_rel_trigger',
   notify_on_missing=True)
 F('rel_unit_3', win_tester().ChromiumFactory(
@@ skipping 185 matching lines @@
   'win_rel_trigger', notify_on_missing=True)
 B('Chrome Frame Tests (ie9)', 'rel_cf', 'testers|windows', 'win_rel_trigger',
   notify_on_missing=True)
 
 ################################################################################
 ## Debug
 ################################################################################
 
 dbg_archive = master_config.GetArchiveUrl('ChromiumWin', 'Win Builder (dbg)',
                                           'cr-win-dbg', 'win32')
-dbg_aura_archive = master_config.GetArchiveUrl('ChromiumWin',
-                                               'Win Aura Builder',
-                                               'Win_Aura_Builder', 'win32')
 
 #
 # Main debug scheduler for src/
 #
 S('win_dbg', branch='src', treeStableTimer=60)
 
 #
 # Triggerable scheduler for the dbg builder
 #
 T('win_dbg_trigger')
-T('win_dbg_aura_trigger')
 
 #
 # Win x64 Dbg Builder
 #
 B('Win x64 Builder (dbg)', 'dbg_x64', 'compile|windows', 'win_dbg',
   builddir='cr-win-dbg-x64', auto_reboot=False, notify_on_missing=True)
 F('dbg_x64', win_out().ChromiumFactory(
     slave_type='Builder',
     target='Debug_x64',
     options=['--build-tool=ninja', '--', 'chromium_builder_tests'],
@@ skipping 147 matching lines @@
     build_url=dbg_archive,
     tests=['interactive_ui_tests'],
     factory_properties={
       'generate_gtest_json': True,
       'process_dumps': True,
       'sharded_tests': sharded_tests,
       'start_crash_handler': True,
     }))
 
 #
-# Dbg Aura builder
-#
-
-aura_gyp_defines = 'use_aura=1 fastbuild=1 chromium_win_pch=0'
-
-B('Win Aura Builder', 'dbg_aura', 'compile|windows', 'win_dbg',

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

This removes bots - I'm pretty sure you'll need to modify slaves.cfg here and in
the tryserver.

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

Thanks, updated slaves.cfg in this directory.
Which file exactly do you mean?

-  auto_reboot=False, notify_on_missing=True)
-F('dbg_aura', win_out().ChromiumFactory(
-    target='Debug',
-    options=['--build-tool=ninja', '--compiler=goma', '--', 'aura_builder'],
-    slave_type='Builder',
-    factory_properties={'gclient_env': {'GYP_DEFINES': aura_gyp_defines},
-                        'trigger': 'win_dbg_aura_trigger'}))
-
-#
 # Dbg Aura Testers
 #
 
-B('Win Aura Tests (1)', 'dbg_aura_test_1', 'testers|windows',
-  'win_dbg_aura_trigger', notify_on_missing=True)
-F('dbg_aura_test_1', win_tester().ChromiumFactory(
-    target='Debug',
-    slave_type='Tester',
-    build_url=dbg_aura_archive,
-    tests=['ash_unittests',
-           'aura',
-           'browser_tests',
-           'chrome_frame_net_tests',
-           'chrome_frame_tests',
-           'content_browsertests',
-          ],
-    factory_properties={'process_dumps': True,
-                        'sharded_tests': sharded_tests,
-                        'browser_total_shards': 3, 'browser_shard_index': 1,
-                        'start_crash_handler': True,
-                        'generate_gtest_json': True}))
-
-B('Win Aura Tests (2)', 'dbg_aura_test_2', 'testers|windows',
-  'win_dbg_aura_trigger', notify_on_missing=True)
-F('dbg_aura_test_2', win_tester().ChromiumFactory(
-    target='Debug',
-    slave_type='Tester',
-    build_url=dbg_aura_archive,
-    tests=['browser_tests',
-           'chrome_frame_unittests',
-           'compositor',
-           'content_unittests',
-           'unit_tests',
-           'views_unittests',
-          ],
-    factory_properties={'process_dumps': True,
-                        'sharded_tests': sharded_tests,
-                        'browser_total_shards': 3, 'browser_shard_index': 2,
-                        'start_crash_handler': True,
-                        'generate_gtest_json': True}))
-
-B('Win Aura Tests (3)', 'dbg_aura_test_3', 'testers|windows',
-  'win_dbg_aura_trigger', notify_on_missing=True)
-F('dbg_aura_test_3', win_tester().ChromiumFactory(
-    target='Debug',
-    slave_type='Tester',
-    build_url=dbg_aura_archive,
-    tests=['browser_tests',
-           'interactive_ui_tests',
-          ],
-    factory_properties={'process_dumps': True,
-                        'sharded_tests': sharded_tests,
-                        'browser_total_shards': 3, 'browser_shard_index': 3,
-                        'start_crash_handler': True,
-                        'generate_gtest_json': True}))
-
 B('Win8 Aura', 'dbg_aura_win8', 'windows',
-  'win_dbg_aura_trigger', notify_on_missing=True)
+  'win_dbg_trigger', notify_on_missing=True)
 F('dbg_aura_win8', win_tester().ChromiumFactory(
     target='Debug',
     slave_type='Tester',
     build_url=dbg_aura_archive,

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

Please also update this line. With this patch dbg_aura_archive no longer exists.

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

Done.

     tests=['ash_unittests',
            'aura',
            'compositor',
            'views_unittests',
           ],
     factory_properties={
       'generate_gtest_json': True,
       'process_dumps': True,
       'sharded_tests': sharded_tests,
       'start_crash_handler': True,
     }))
 
 def Update(config, active_master, c):
   return helper.Update(c)