Perf: Removing S5s from waterfall

tools/perf/generate_perf_json.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Script to generate chromium.perf.json and chromium.perf.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 14 matching lines @@
     'args': [
       'gpu_perftests',
       '--adb-path',
       'src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb',
     ],
     'name': 'gpu_perftests',
     'script': 'gtest_perf_test.py',
     'testers': {
       'chromium.perf': [
         {
-          'name': 'Android Galaxy S5 Perf',
-          'shards': [3]
-        },
-        {
           'name': 'Android Nexus5 Perf',
           'shards': [2]
         },
         {
           'name': 'Android Nexus7v2 Perf',
           'shards': [2]
         }
         # crbug.com/663762
         #{
         #  'name': 'Android Nexus9 Perf',
         #  'shards': [2]
         #}
       ],
-      'chromium.perf.fyi': [
-        {
-          'name': 'Android Galaxy S5 Perf',
-          'shards': [1]
-        },
-      ]
     }
   },
   {
     'args': [
       'cc_perftests',
       '--adb-path',
       'src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb',
     ],
     'name': 'cc_perftests',
     'script': 'gtest_perf_test.py',
     'testers': {
       'chromium.perf': [
         {
-          'name': 'Android Galaxy S5 Perf',
-          'shards': [3]
-        },
-        {
           'name': 'Android Nexus5 Perf',
           'shards': [2]
         },
         {
           'name': 'Android Nexus6 Perf',
           'shards': [2]
         },
         {
           'name': 'Android Nexus7v2 Perf',
           'shards': [2]
         },
         {
           'name': 'Android Nexus9 Perf',
           'shards': [2]
         },
       ],
-      'chromium.perf.fyi': [
-        {
-          'name': 'Android Galaxy S5 Perf',
-          'shards': [1]
-        },
-      ]
     }
   },
   {
     'args': [
       'cc_perftests',
       '--test-launcher-print-test-stdio=always'
     ],
     'name': 'cc_perftests',
     'script': 'gtest_perf_test.py',
     'testers': {
@@ skipping 25 matching lines @@
     'args': [
       'tracing_perftests',
       '--adb-path',
       'src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb',
     ],
     'name': 'tracing_perftests',
     'script': 'gtest_perf_test.py',
     'testers': {
       'chromium.perf': [
         {
-          'name': 'Android Galaxy S5 Perf',
-          'shards': [3]
-        },
-        {
           'name': 'Android Nexus5 Perf',
           'shards': [2]
         },
         {
           'name': 'Android Nexus6 Perf',
           'shards': [2]
         },
         {
           'name': 'Android Nexus7v2 Perf',
           'shards': [2]
@@ skipping 123 matching lines @@
   if swarming:
     waterfall['testers'][name]['swarming_dimensions'] = swarming
     waterfall['testers'][name]['swarming'] = True
 
   return waterfall
 
 
 def get_fyi_waterfall_config():
   waterfall = {'builders':[], 'testers': {}}
   waterfall = add_tester(
-    waterfall, 'Android Galaxy S5 Perf',
-    'android-galaxy-s5-perf', 'android')
-  waterfall = add_tester(
     waterfall, 'Win 10 Low-End Perf Tests',
     'win-10-low-end', 'win',
     swarming=[
       {
        'gpu': '1002:9874',
        'os': 'Windows-10-10586',
        'device_ids': [
            'build171-b4', 'build186-b4', 'build202-b4', 'build203-b4',
            'build204-b4', 'build205-b4', 'build206-b4', 'build207-b4',
            'build208-b4', 'build209-b4', 'build210-b4', 'build211-b4',
@@ skipping 23 matching lines @@
   return waterfall
 
 
 def get_waterfall_config():
   waterfall = {'builders':[], 'testers': {}}
 
   # These configurations are taken from chromium_perf.py in
   # build/scripts/slave/recipe_modules/chromium_tests and must be kept in sync
   # to generate the correct json for each tester
   waterfall = add_tester(
-    waterfall, 'Android Galaxy S5 Perf',
-    'android-galaxy-s5', 'android', target_bits=32,
-    num_device_shards=7, num_host_shards=3)
-  waterfall = add_tester(
     waterfall, 'Android Nexus5 Perf', 'android-nexus5',
     'android', target_bits=32, num_device_shards=7, num_host_shards=3)
   waterfall = add_tester(
     waterfall, 'Android Nexus5X Perf', 'android-nexus5X',
     'android', target_bits=32, num_device_shards=7, num_host_shards=3)
   waterfall = add_tester(
     waterfall, 'Android Nexus6 Perf', 'android-nexus6',
     'android', target_bits=32, num_device_shards=7, num_host_shards=3)
   waterfall = add_tester(
     waterfall, 'Android Nexus7v2 Perf', 'android-nexus7v2',
@@ skipping 373 matching lines @@
   waterfall['name'] = 'chromium.perf'
   fyi_waterfall = get_fyi_waterfall_config()
   fyi_waterfall['name'] = 'chromium.perf.fyi'
 
   generate_all_tests(fyi_waterfall)
   generate_all_tests(waterfall)
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())