Bug 906466, assorted clean up of signing server config (fixes elm, oak, removes unused config, reset birch), r=catlee
authorNick Thomas <nthomas@mozilla.com>
Tue, 20 Aug 2013 11:12:39 +1200
changeset 8967 7edb94db7b3a25c5560b2e218ccf4b01ef4f8940
parent 8966 9bd33c91a3e59a1d4e9810415cd8a11e8362728a
child 8970 9cdee802ce13a13bf01d96922e53373532995204
push id6728
push usernthomas@mozilla.com
push dateMon, 19 Aug 2013 23:13:20 +0000
reviewerscatlee
bugs906466
Bug 906466, assorted clean up of signing server config (fixes elm, oak, removes unused config, reset birch), r=catlee
mozilla/config.py
mozilla/project_branches.py
mozilla/thunderbird_config.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1568,22 +1568,20 @@ BRANCHES['mozilla-central']['aus2_base_u
 BRANCHES['mozilla-central']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-central'
 BRANCHES['mozilla-central']['aus2_mobile_base_upload_dir'] = '/opt/aus2/incoming/2/Fennec/mozilla-central'
 BRANCHES['mozilla-central']['aus2_mobile_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Fennec/mozilla-central'
 BRANCHES['mozilla-central']['enable_blocklist_update'] = True
 BRANCHES['mozilla-central']['enable_hsts_update'] = True
 BRANCHES['mozilla-central']['platforms']['android-armv6']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-armv6'
 BRANCHES['mozilla-central']['platforms']['android-x86']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-x86'
 BRANCHES['mozilla-central']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
-
 BRANCHES['mozilla-central']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-central']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-central']['platforms']['android']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-central']['platforms']['android-armv6']['nightly_signing_servers'] = 'nightly-signing'
-BRANCHES['mozilla-central']['platforms']['macosx64-debug']['nightly_signing_servers'] = 'mac-nightly-signing'
 BRANCHES['mozilla-central']['platforms']['macosx64']['nightly_signing_servers'] = 'mac-nightly-signing'
 BRANCHES['mozilla-central']['l10n_extra_configure_args'] = ['--with-macbundlename-prefix=Firefox']
 
 ######## mozilla-release
 BRANCHES['mozilla-release']['repo_path'] = 'releases/mozilla-release'
 BRANCHES['mozilla-release']['update_channel'] = 'release'
 BRANCHES['mozilla-release']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
 BRANCHES['mozilla-release']['enable_weekly_bundle'] = True
@@ -1710,17 +1708,16 @@ BRANCHES['mozilla-aurora']['aus2_mobile_
 BRANCHES['mozilla-aurora']['enable_blocklist_update'] = True
 BRANCHES['mozilla-aurora']['enable_hsts_update'] = True
 BRANCHES['mozilla-aurora']['enable_valgrind'] = False
 BRANCHES['mozilla-aurora']['platforms']['android-armv6']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-armv6'
 # aurora nightlies should use our nightly signing server
 BRANCHES['mozilla-aurora']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
-BRANCHES['mozilla-aurora']['platforms']['macosx64-debug']['nightly_signing_servers'] = 'mac-nightly-signing'
 BRANCHES['mozilla-aurora']['platforms']['macosx64']['nightly_signing_servers'] = 'mac-nightly-signing'
 BRANCHES['mozilla-aurora']['l10n_extra_configure_args'] = ['--with-macbundlename-prefix=Firefox']
 BRANCHES['mozilla-aurora']['enabled_products'] = ['firefox', 'mobile']
 
 ######## mozilla-esr17
 BRANCHES['mozilla-esr17']['repo_path'] = 'releases/mozilla-esr17'
 BRANCHES['mozilla-esr17']['update_channel'] = 'nightly-esr17'
 BRANCHES['mozilla-esr17']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -27,73 +27,36 @@ PROJECT_BRANCHES = {
         'pgo_strategy': 'periodic',
         'branch_projects': [ 'spidermonkey_tier_1', 'spidermonkey_info' ],
     },
     # Please sync any customizations made to mozilla-inbound to cypress.
     'mozilla-inbound': {
         'repo_path': 'integration/mozilla-inbound',
         'enable_perproduct_builds': True,
         'mozconfig_dir': 'mozilla-central',
-        'enable_nightly': False,
         'enable_weekly_bundle': True,
         'pgo_strategy': 'periodic',
         'periodic_pgo_interval': 3,
         'talos_suites': {
             'xperf': 1,
         },
-        'platforms': {
-            'linux64': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-            'linux': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-            'macosx64-debug': {
-                'nightly_signing_servers': 'mac-nightly-signing',
-            },
-            'macosx64': {
-                'nightly_signing_servers': 'mac-nightly-signing',
-            },
-            'win32': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-        },
         'branch_projects': [ 'spidermonkey_tier_1', 'spidermonkey_info' ],
     },
     # Customized to be the same as inbound. bug 866314
     'cypress': {
         'enable_perproduct_builds': True,
         'mozconfig_dir': 'mozilla-central',
-        'enable_nightly': False,
         'enable_weekly_bundle': True,
         'pgo_strategy': 'periodic',
         'periodic_pgo_interval': 3,
         'talos_suites': {
             'xperf': 1,
         },
-        'platforms': {
-            'linux64': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-            'linux': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-            'macosx64-debug': {
-                'nightly_signing_servers': 'mac-nightly-signing',
-            },
-            'macosx64': {
-                'nightly_signing_servers': 'mac-nightly-signing',
-            },
-            'win32': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-        },
         'branch_projects': [ 'spidermonkey_tier_1', 'spidermonkey_info' ],
     },
-    # Please sync any customizations made to birch to b2g-inbound.
     'b2g-inbound': {
         'repo_path': 'integration/b2g-inbound',
         'enable_perproduct_builds': True,
         'mozconfig_dir': 'mozilla-central',
         'pgo_strategy': 'periodic',
         'periodic_pgo_interval': 3,
         'enable_weekly_bundle': True,
         'talos_suites': {
@@ -120,42 +83,29 @@ PROJECT_BRANCHES = {
         },
     },
     'profiling': {
         'pgo_strategy': 'periodic',
         'platforms': {
             'macosx64-debug': {
                 'dont_build': True,
                 'enable_debug_unittests': False,
-                'nightly_signing_servers': 'mac-nightly-signing',
-            },
-            'macosx64': {
-                'nightly_signing_servers': 'mac-nightly-signing',
-            },
-            'linux': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
-            'linux64': {
-                'nightly_signing_servers': 'nightly-signing',
             },
             'linux-debug': {
                 'dont_build': True,
                 'enable_debug_unittests': False,
             },
             'linux64-debug': {
                 'dont_build': True,
                 'enable_debug_unittests': False,
             },
             'win32-debug': {
                 'dont_build': True,
                 'enable_debug_unittests': False,
             },
-            'win32': {
-                'nightly_signing_servers': 'nightly-signing',
-            },
         },
         'mobile_platforms': {
             'android-debug': {
                 'dont_build': True,
                 'enable_debug_unittests': False,
             },
         },
     },
@@ -173,19 +123,16 @@ PROJECT_BRANCHES = {
         'packaged_unittest_tinderbox_tree': 'UX',
         'enabled_products': ['firefox'],
         'mozconfig_dir': 'ux',
         'enable_nightly': True,
         'create_snippet': True,
         'create_partial': True,
         'pgo_strategy': 'periodic',
         'platforms': {
-            'macosx64-debug': {
-                'nightly_signing_servers': 'mac-nightly-signing',
-            },
             'macosx64': {
                 'nightly_signing_servers': 'mac-nightly-signing',
             },
             'linux': {
                 'nightly_signing_servers': 'nightly-signing',
             },
             'linux64': {
                 'nightly_signing_servers': 'nightly-signing',
@@ -233,45 +180,17 @@ PROJECT_BRANCHES = {
             'win32-debug': {},
         },
         'mobile_platforms': {
             'android': {
                 'slave_platforms': ['panda_android', 'panda_android-nomozpool'],
             },
         },
     },
-    # Please sync any customizations made to birch to b2g-inbound.
-    'birch': {
-        'enable_perproduct_builds': True,
-        'mozconfig_dir': 'mozilla-central',
-        'pgo_strategy': 'periodic',
-        'periodic_pgo_interval': 3,
-        'talos_suites': {
-            'xperf': 1,
-        },
-        'platforms': {
-            'win32': {
-                'enable_checktests': False,
-                'slave_platforms': ['win8'],
-                'talos_slave_platforms': ['win8'],
-            },
-            'win32-debug': {
-                'enable_checktests': False,
-                'slave_platforms': ['win8'],
-            },
-            'macosx64': {
-                'enable_checktests': False,
-                'slave_platforms': ['mountainlion'],
-            },
-            'macosx64-debug': {
-                'enable_checktests': False,
-                'slave_platforms': ['mountainlion'],
-            },
-        },
-    },
+    'birch': {},
     'cedar': {
         'mozharness_tag': 'default',
         'lock_platforms': True,
         'enable_talos': True,
         'talos_suites': {
             'xperf': 1,
         },
         'enable_nightly': True,
@@ -327,31 +246,37 @@ PROJECT_BRANCHES = {
     'date': {
         'lock_platforms': True,
         'platforms': {
             'win64': {
                 'enable_opt_unittests': True,
             },
         },
     },
-    # customizations for windows update service changes (bug 481815)
+    # customizations for PICL (bug 900212)
     'elm': {
         'enable_nightly': True,
         'enable_weekly_bundle': True,
         'create_snippet': True,
         'create_partial': True,
         'enable_talos': False,
         'lock_platforms': True,
         'platforms': {
-            'linux': {},
+            'linux': {
+                'nightly_signing_servers': 'nightly-signing',
+            },
             'linux-debug': {},
-            'linux64': {},
+            'linux64': {
+                'nightly_signing_servers': 'nightly-signing',
+            },
             'linux64-debug': {},
             'macosx64-debug': {},
-            'macosx64': {},
+            'macosx64': {
+                'nightly_signing_servers': 'mac-nightly-signing',
+            },
             'win32': {
                 'nightly_signing_servers': 'nightly-signing',
             },
             'win32-debug': {},
         },
         'mobile_platforms': {
             'android': {},
             'android-debug': {},
@@ -406,16 +331,19 @@ PROJECT_BRANCHES = {
         'enable_talos': False,
         'platforms': {
             'linux': {
                 'nightly_signing_servers': 'nightly-signing',
             },
             'linux64': {
                 'nightly_signing_servers': 'nightly-signing',
             },
+            'macosx64': {
+                'nightly_signing_servers': 'mac-nightly-signing',
+            },
             'win32': {
                 'nightly_signing_servers': 'nightly-signing',
             },
         },
     },
     'pine': {},
 }
 
--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -740,17 +740,16 @@ BRANCHES['comm-central']['create_partial
 BRANCHES['comm-central']['create_partial_l10n'] = True
 BRANCHES['comm-central']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Thunderbird/comm-central'
 BRANCHES['comm-central']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Thunderbird/comm-central'
 BRANCHES['comm-central']['enable_blocklist_update'] = True
 BRANCHES['comm-central']['blocklist_update_on_closed_tree'] = False
 BRANCHES['comm-central']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['comm-central']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['comm-central']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
-BRANCHES['comm-central']['platforms']['macosx64-debug']['nightly_signing_servers'] = 'mac-nightly-signing'
 BRANCHES['comm-central']['platforms']['macosx64']['nightly_signing_servers'] = 'mac-nightly-signing'
 
 ######## comm-release
 BRANCHES['comm-release']['repo_path'] = 'releases/comm-esr17'
 BRANCHES['comm-release']['moz_repo_path'] = 'releases/mozilla-esr17'
 BRANCHES['comm-release']['update_channel'] = 'release'
 BRANCHES['comm-release']['mozilla_dir'] = 'mozilla'
 BRANCHES['comm-release']['skip_blank_repos'] = True
@@ -947,17 +946,16 @@ BRANCHES['comm-aurora']['create_partial_
 BRANCHES['comm-aurora']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Thunderbird/comm-aurora'
 BRANCHES['comm-aurora']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Thunderbird/comm-aurora'
 BRANCHES['comm-aurora']['enable_blocklist_update'] = True
 BRANCHES['comm-aurora']['blocklist_update_on_closed_tree'] = False
 BRANCHES['comm-aurora']['enable_valgrind'] = False
 BRANCHES['comm-aurora']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['comm-aurora']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['comm-aurora']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
-BRANCHES['comm-aurora']['platforms']['macosx64-debug']['nightly_signing_servers'] = 'mac-nightly-signing'
 BRANCHES['comm-aurora']['platforms']['macosx64']['nightly_signing_servers'] = 'mac-nightly-signing'
 
 ######## try
 # Try-specific configs
 BRANCHES['try-comm-central']['stage_username'] = 'tbirdtry'
 BRANCHES['try-comm-central']['stage_ssh_key'] = 'trybld_dsa'
 BRANCHES['try-comm-central']['stage_base_path'] = '/home/ftp/pub/thunderbird/try-builds'
 BRANCHES['try-comm-central']['enable_merging'] = False