merge default to production. a=jorgk production
authorJorg K
Mon, 26 Feb 2018 14:24:02 +0100
branchproduction
changeset 15702 1174a9ee59a6d509c6988955cba29b61c3b20970
parent 15690 48fd98373e324dea462b02ab3d65cee7d0b5a273 (current diff)
parent 15701 611002f8acd2e59db8e941a7e674ab4f52486c2c (diff)
child 15705 3272845d28c39795d7081032b54e658a3dc7e0ea
push id11033
push usermozilla@jorgk.com
push dateMon, 26 Feb 2018 13:25:39 +0000
reviewersjorgk
merge default to production. a=jorgk
--- a/mozilla-tests/BuildSlaves.py.template
+++ b/mozilla-tests/BuildSlaves.py.template
@@ -26,17 +26,16 @@ SlavePasswords = {
     "win7_vm_devedition": "pass",
     "win7_vm_gfx": "pass",
     "win7_vm_gfx_devedition": "pass",
     "win8": "pass",
     "win8_64": "pass",
     "win8_64_devedition": "pass",
     "win10": "pass",
     "win10_64": "pass",
-    "win10_64_ccov": "pass",
     "win10_64_devedition": "pass",
     "win10_64_stylo_disabled": "pass",
     "win10_64_asan": "pass",
     "w764": "pass",
     "win64_vm": "pass",
 }
 
 blobber_username = 'user'
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -59,17 +59,16 @@ PLATFORMS = {
     'linux64-devedition': {},
     'macosx64': {},
     'macosx64-devedition':{},
     'win32': {},
     'win32-devedition': {},
     'win32-stylo-disabled': {},
     'win64': {},
     'win64-asan': {},
-    'win64-ccov': {},
     'win64-devedition':{},
     'win64-stylo-disabled': {},
 }
 
 PLATFORMS['macosx64']['slave_platforms'] = ['yosemite_r7']
 PLATFORMS['macosx64']['env_name'] = 'mac-perf'
 PLATFORMS['macosx64']['yosemite_r7'] = {'name': "Rev7 MacOSX Yosemite 10.10.5"}
 PLATFORMS['macosx64']['stage_product'] = 'firefox'
@@ -161,28 +160,16 @@ PLATFORMS['win64-asan']['win10_64_asan']
 PLATFORMS['win64-asan']['stage_product'] = 'firefox'
 PLATFORMS['win64-asan']['mozharness_config'] = {
     'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
     'hg_bin': 'c:\\mozilla-build\\hg\\hg',
     'reboot_command': ['c:/mozilla-build/python27/python', '-u'] + MOZHARNESS_REBOOT_CMD,
     'config_file': 'talos/windows_config.py',
 }
 
-PLATFORMS['win64-ccov']['slave_platforms'] = ['win10_64_ccov']
-PLATFORMS['win64-ccov']['env_name'] = 'win64-perf'
-PLATFORMS['win64-ccov']['win10_64_ccov'] = {'name': 'Windows 10 64-bit Code Coverage',
-                                                       'try_by_default': False}
-PLATFORMS['win64-ccov']['stage_product'] = 'firefox'
-PLATFORMS['win64-ccov']['mozharness_config'] = {
-    'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
-    'hg_bin': 'c:\\mozilla-build\\hg\\hg',
-    'reboot_command': ['c:/mozilla-build/python27/python', '-u'] + MOZHARNESS_REBOOT_CMD,
-    'config_file': 'talos/windows_config.py',
-}
-
 PLATFORMS['win64-stylo-disabled']['slave_platforms'] = ['win10_64_stylo_disabled']
 PLATFORMS['win64-stylo-disabled']['talos_slave_platforms'] = []
 PLATFORMS['win64-stylo-disabled']['env_name'] = 'win64-perf'
 PLATFORMS['win64-stylo-disabled']['win10_64_stylo_disabled'] = {'name': 'Windows 10 64-bit stylo-disabled',
                                                        'try_by_default': False}
 PLATFORMS['win64-stylo-disabled']['stage_product'] = 'firefox'
 PLATFORMS['win64-stylo-disabled']['mozharness_config'] = {
     'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
@@ -625,17 +612,16 @@ BRANCH_UNITTEST_VARS = {
         'linux64-asan': {},
         'macosx64': {},
         'macosx64-devedition':{},
         'win32': {},
         'win32-devedition':{},
         'win32-stylo-disabled': {},
         'win64':{},
         'win64-asan': {},
-        'win64-ccov': {},
         'win64-devedition': {},
         'win64-stylo-disabled':{},
     },
 }
 
 ### The below section contains definitions for all of the test suites
 ### available for desktop testing.
 
@@ -2468,30 +2454,16 @@ PLATFORM_UNITTEST_VARS = {
         'enable_opt_unittests': True,
         'enable_debug_unittests': True,
         'win10_64_asan': {
             'opt_unittest_suites': [],
             'debug_unittest_suites': [],
             'suite_config': {},
         },
     },
-    'win64-ccov': {
-        'product_name': 'firefox',
-        'app_name': 'browser',
-        'brand_name': 'Minefield',
-        'builds_before_reboot': 1,
-        'env_name': 'win64-perf-unittest',
-        'enable_opt_unittests': True,
-        'enable_debug_unittests': True,
-        'win10_64_ccov': {
-            'opt_unittest_suites': [],
-            'debug_unittest_suites': [],
-            'suite_config': {},
-        },
-    },
     'win64-devedition': {
         'product_name': 'firefox',
         'app_name': 'browser',
         'brand_name': 'Minefield',
         'builds_before_reboot': 1,
         'mochitest_leak_threshold': 484,
         'crashtest_leak_threshold': 484,
         'env_name': 'win64-perf-unittest',
@@ -3604,29 +3576,16 @@ for name, branch in items_at_least(BRANC
         for slave_platform in PLATFORMS[platform]['slave_platforms']:
             if slave_platform not in branch['platforms'][platform]:
                 continue
             tests = branch['platforms'][platform][slave_platform]
 
             tests['opt_unittest_suites'] = [t for t in tests['opt_unittest_suites'] if t in opt]
             tests['debug_unittest_suites'] = [t for t in tests['debug_unittest_suites'] if t in debug]
 
-# Bug 1417496 - Enable reftests for Windows coverage build
-for name, branch in items_at_least(BRANCHES, 'gecko_version', 57):
-    for platform in branch['platforms']:
-        if platform not in PLATFORMS:
-            continue
-        if platform == 'win64-ccov':
-            if name not in ['mozilla-central', 'try']:
-                BRANCHES[name]['platforms'][platform] = {}
-            else:
-                BRANCHES[name]['platforms'][platform]['win10_64_ccov']['opt_unittest_suites'] = []
-                BRANCHES[name]['platforms'][platform]['win10_64_ccov']['debug_unittest_suites'] = REFTEST_E10S_TWO_CHUNKS + REFTEST_NOACCEL_E10S_TWO_CHUNKS
-
-
 
 if __name__ == "__main__":
     import sys
     import pprint
 
     args = sys.argv[1:]
 
     if len(args) > 0:
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -5,17 +5,16 @@ SLAVES = {
     'win7_vm': {},
     'win7_vm_devedition': {},
     'win7_vm_gfx': {},
     'win7_vm_gfx_devedition': {},
     'win8': {},
     'win8_64_devedition': {},
     'win10': {},
     'win10_64_asan': {},
-    'win10_64_ccov': {},
     'win10_64_devedition': {},
     'yosemite_r7': {},
     'yosemite_r7_devedition': {},
     'ubuntu32_vm': {},
     'ubuntu64_vm': {},
     'ubuntu64_vm_large': {},
     'ubuntu64_vm_lnx_large': {},
     'ubuntu64-asan_vm_lnx_large': {},
@@ -67,17 +66,16 @@ for i in range(1, 90):       #Bug 133739
 
 for i in range(1, 3):
     SLAVES['win64_vm']['tst-w64-ec2-%03i' % i] = {}
 
 SLAVES['ubuntu64-asan_vm'] = SLAVES['ubuntu64_vm']
 SLAVES['win8_64'] = SLAVES['win8']
 SLAVES['win10_64'] = SLAVES['win10']
 SLAVES['win10_64_asan'] = SLAVES['win10']
-SLAVES['win10_64_ccov'] = SLAVES['win10']
 SLAVES['win10_64_devedition'] = SLAVES['win10']
 SLAVES['win10_64_stylo_disabled'] = SLAVES['win10']
 SLAVES['win7_ix_stylo_disabled'] = SLAVES['win7_ix']
 SLAVES['ubuntu64_vm_mobile'] = SLAVES['ubuntu64_vm']
 SLAVES['ubuntu64_vm_armv7_mobile'] = SLAVES['ubuntu64_vm']
 SLAVES['ubuntu64_vm_armv7_large'] = SLAVES['ubuntu64_vm_large']
 SLAVES['ubuntu64_vm_lnx_large'] = SLAVES['ubuntu64_vm_large']
 SLAVES['ubuntu64-asan_vm_lnx_large'] = SLAVES['ubuntu64_vm_large']
--- a/mozilla/l10n/all-locales.comm-beta
+++ b/mozilla/l10n/all-locales.comm-beta
@@ -33,16 +33,17 @@ is
 it
 ja
 ja-JP-mac
 ka
 kab
 kk
 ko
 lt
+ms
 nb-NO
 nl
 nn-NO
 pa-IN
 pl
 pt-BR
 pt-PT
 rm
--- a/mozilla/l10n/all-locales.comm-central
+++ b/mozilla/l10n/all-locales.comm-central
@@ -1,27 +1,29 @@
 af
 ar
 ast
 be
 bg
 bn-BD
 br
 ca
+cak
 cs
 cy
 da
 de
 dsb
 el
 en-GB
 es-AR
 es-ES
 et
 eu
+fa
 fi
 fr
 fy-NL
 ga-IE
 gd
 gl
 he
 hr
@@ -33,16 +35,17 @@ is
 it
 ja
 ja-JP-mac
 ka
 kab
 kk
 ko
 lt
+ms
 nb-NO
 nl
 nn-NO
 pa-IN
 pl
 pt-BR
 pt-PT
 rm