bug 602120 - new master for n900s r=aki p=jhford
author'John Ford <jhford@mozilla.com>'
Thu, 21 Oct 2010 14:58:09 -0700
changeset 3164 c5f1d20795a5945dd1d1cecedc56993c97e98c61
parent 3163 2fa3543c3c79c46b65743035d201b38b28932cb3
child 3165 9175faff858e67bc5596c14830220dc4bfd64ef7
push id2504
push userjford@mozilla.com
push dateThu, 21 Oct 2010 22:15:21 +0000
reviewersaki
bugs602120
bug 602120 - new master for n900s r=aki p=jhford
mobile/config-production-n900.py
mobile/config-staging-n900.py
copy from mobile/config-production.py
copy to mobile/config-production-n900.py
--- a/mobile/config-production.py
+++ b/mobile/config-production-n900.py
@@ -1,13 +1,13 @@
 from copy import deepcopy
 
 import defaults
 reload(defaults)
-from defaults import default_n900, default_n810
+from defaults import default_n900
 
 base_dep_location = 'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds'
 base_nightly_location = 'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly'
 
 def generate_platform(base_platform, build_branch, talos_branch,
                       nightly_multi=False, nightly_unit=False,
                       nightly_talos=False, dep_unit=False, dep_talos=False):
     new_platform = deepcopy(base_platform)
@@ -22,29 +22,27 @@ def generate_platform(base_platform, bui
         new_platform['talos_build_dirs'].append(nightly_location)
     if nightly_unit:
         new_platform['unit_build_dirs'].append(nightly_location)
     new_platform['talos_branch'] = talos_branch
     return new_platform
 
 SLAVES = {
     'n900': ['n900-%03i' % x for x in range(1,91)],
-    'n810': ['maemo-n810-%02i' % x for x in range(1,81)],
 }
 
 default_n900['slaves'] = SLAVES['n900']
-default_n810['slaves'] = SLAVES['n810']
 
 # Remove these to run tp4 in production
 del default_n900['talos_suites']['tp4']
 del default_n900['talos_suites']['tp4_nochrome']
 
 MASTER = {'name': 'production-mobile-master',
-          'slave_port': 9020,
-          'http_port': 8020,
+          'slave_port': 9010,
+          'http_port': 8010,
           'admin_emails': ['jhford@mozilla.com', 'aki@mozilla.com'],
 }
 
 BRANCHES = {
     'mozilla-central': {
         'tinderbox_tree': 'Mobile',
         'graph_server': 'graphs.mozilla.org',
         'tree_stable_timer': 2,
@@ -69,22 +67,16 @@ BRANCHES = {
         'tree_stable_timer': 2,
         'platforms': {
             'n900-gtk': generate_platform(default_n900,
                 build_branch='mozilla-1.9.2-maemo5-gtk',
                 talos_branch='mobile-1.9.2',
                 nightly_multi=True,
                 nightly_unit=True, dep_unit=True,
                 nightly_talos=True, dep_talos=True),
-            'n810': generate_platform(default_n810,
-                build_branch='mozilla-1.9.2-maemo4',
-                talos_branch='mobile-1.9.2',
-                nightly_multi=True,
-                nightly_unit=True, dep_unit=True,
-                nightly_talos=True, dep_talos=True),
         },
     },
     'tracemonkey': {
         'tinderbox_tree': 'TraceMonkey',
         'graph_server': 'graphs.mozilla.org',
         'tree_stable_timer': 2,
         'platforms': {
             'n900-gtk': generate_platform(default_n900,
copy from mobile/config-staging.py
copy to mobile/config-staging-n900.py
--- a/mobile/config-staging.py
+++ b/mobile/config-staging-n900.py
@@ -1,13 +1,13 @@
 from copy import deepcopy
 
 import defaults
 reload(defaults)
-from defaults import default_n900, default_n810
+from defaults import default_n900
 
 base_dep_location = 'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds'
 base_nightly_location = 'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly'
 
 def generate_platform(base_platform, build_branch, talos_branch,
                       nightly_multi=False, nightly_unit=False,
                       nightly_talos=False, dep_unit=False, dep_talos=False):
     new_platform = deepcopy(base_platform)
@@ -23,33 +23,27 @@ def generate_platform(base_platform, bui
     if nightly_unit:
         new_platform['unit_build_dirs'].append(nightly_location)
     new_platform['talos_branch'] = talos_branch
     return new_platform
 
 
 SLAVES = {
     'n900': ['n900-%03i' % x for x in range(1,91)],
-    'n810': ['maemo-n810-%02i' % x for x in range(1,81)],
 }
 
 default_n900['slaves'] = SLAVES['n900']
-default_n810['slaves'] = SLAVES['n810']
 default_n900['talos_tarball'] = 'http://10.250.48.136/maemo5/talos.tar.bz2'
 default_n900['pageloader_tarball'] = 'http://10.250.48.136/maemo5/pageloader.tar.bz2'
 default_n900['maemkit_tarball'] = 'http://10.250.48.136/maemo5/maemkit.tar.bz2'
 default_n900['tp4_tarball'] = 'http://10.250.48.136/maemo5/tp4.tar.bz2'
-default_n810['talos_tarball'] = 'http://10.250.48.136/maemo/talos.tar.bz2'
-default_n810['pageloader_tarball'] = 'http://10.250.48.136/maemo/pageloader.tar.bz2'
-default_n810['maemkit_tarball'] = 'http://10.250.48.136/maemo/maemkit.tar.bz2'
-default_n810['tp4_tarball'] = 'http://10.250.48.136/maemo/tp4.tar.bz2'
 
 MASTER = {'name': 'staging-mobile-master',
-          'slave_port': 9020,
-          'http_port': 8020,
+          'slave_port': 9010,
+          'http_port': 8010,
           'admin_emails': [],
 }
 
 BRANCHES = {
     'mozilla-central': {
         'tinderbox_tree': 'MobileTest',
         'graph_server': 'graphs-stage.mozilla.org',
         'tree_stable_timer': 0,
@@ -74,22 +68,16 @@ BRANCHES = {
         'tree_stable_timer': 0,
         'platforms': {
             'n900-gtk': generate_platform(default_n900,
                 build_branch='mozilla-1.9.2-maemo5-gtk',
                 talos_branch='mobile-1.9.2',
                 nightly_multi=True,
                 nightly_unit=True, dep_unit=True,
                 nightly_talos=True, dep_talos=True),
-            'n810': generate_platform(default_n810,
-                build_branch='mozilla-1.9.2-maemo4',
-                talos_branch='mobile-1.9.2',
-                nightly_multi=True,
-                nightly_unit=True, dep_unit=True,
-                nightly_talos=True, dep_talos=True),
         },
     },
     'tracemonkey': {
         'tinderbox_tree': 'MobileTest',
         'graph_server': 'graphs-stage.mozilla.org',
         'tree_stable_timer': 0,
         'platforms': {
             'n900-gtk': generate_platform(default_n900,