Bug 884454 - [seamonkey only] hack up setup-master.py for SeaMonkey. seamonkey-production
authorJustin Wood <Callek@gmail.com>
Tue, 18 Jun 2013 23:19:50 -0400
branchseamonkey-production
changeset 8591 e82326b1ecad6d6f5493147b241d756509164117
parent 8590 ce40a5746a8e4811b2212b8eb987e8f4f21a79e1
child 8592 32ed30100d5ea643c8010247f76a38e90c4753f1
push id6510
push userCallek@gmail.com
push dateWed, 19 Jun 2013 03:20:05 +0000
bugs884454
Bug 884454 - [seamonkey only] hack up setup-master.py for SeaMonkey. Bring up sea-master1 with puppet
setup-master.py
--- a/setup-master.py
+++ b/setup-master.py
@@ -184,62 +184,65 @@ def load_masters_json(masters_json, role
     for m in masters:
         # Sometimes we only want masters of a specific role to be loaded
         if role and m['role'] != role:
             continue
         if ignored_roles and m['role'] in ignored_roles:
             continue
 
         if m['environment'] == 'production':
-            environment_config = 'production_config.py'
+            #environment_config = 'production_config.py'
+            environment_config = 'config.py'
         elif m['environment'] == 'staging':
             environment_config = 'staging_config.py'
         elif m['environment'] == 'preproduction':
             environment_config = 'preproduction_config.py'
         c = MasterConfig(name=m['name'],
                          globs=[
                          'config.py',
-                         'thunderbird_config.py',
+                        # 'thunderbird_config.py',
                          '*_config.py',
                          '*_common.py',
-                         'b2g_project_branches.py',
-                         'project_branches.py',
+                        # 'b2g_project_branches.py',
+                        # 'project_branches.py',
                          ],
                          renames=[
                          ('BuildSlaves.py.template', 'BuildSlaves.py'),
                         ('passwords.py.template', 'passwords.py'),
                          ],
                          local_links=[
                          (environment_config, 'localconfig.py'),
-                        ('thunderbird_' +
-                         environment_config, 'thunderbird_localconfig.py'),
-                        ('b2g_' + environment_config, 'b2g_localconfig.py'),
+                        #('thunderbird_' +
+                        # environment_config, 'thunderbird_localconfig.py'),
+                        #('b2g_' + environment_config, 'b2g_localconfig.py'),
                          ],
                          extras=[
                          ('master_config.json', json.dumps(
                           m, indent=2, sort_keys=True)),
                          ],
                          log=log
                          )
 
         if universal:
             c.name += '-universal'
             mastercfg = 'universal_master_sqlite.cfg'
         else:
             if m['role'] == 'tests':
                 mastercfg = 'tests_master.cfg'
             elif m['role'] == 'build' or m['role'] == 'try':
-                mastercfg = 'builder_master.cfg'
+                #mastercfg = 'builder_master.cfg'
+                mastercfg = 'master.cfg'
             elif m['role'] == 'scheduler':
                 mastercfg = 'scheduler_master.cfg'
             else:
                 raise AssertionError("What is a %s role?" % m['role'])
 
         if m['role'] == 'build':
-            c.config_dir = 'mozilla'
+            #c.config_dir = 'mozilla'
+            c.config_dir = 'seamonkey'
             c.globs.append('l10n-changesets*')
             c.globs.append('release_templates')
             if m['environment'] == 'staging':
                 c.globs.append('staging_release-*-*.py')
                 # release-*.py -> staging_release-*.py symlinks
                 c.local_links.extend(
                     [('staging_release-firefox-mozilla-%s.py' % v,
                       'release-firefox-mozilla-%s.py' % v)
@@ -250,22 +253,25 @@ def load_masters_json(masters_json, role
                      for v in ['beta', 'release']
                      ] +
                     [('staging_release-thunderbird-comm-%s.py' % v,
                       'release-thunderbird-comm-%s.py' % v)
                         for v in ['beta', 'release', 'esr17', 'b2g18']
                      ]
                 )
             else:
-                c.globs.append('release-firefox*.py')
-                c.globs.append('release-fennec*.py')
-                c.globs.append('release-thunderbird*.py')
+                #c.globs.append('release-firefox*.py')
+                c.globs.append('release-*.py')
+                c.globs.append('release_master.py')
+                #c.globs.append('release-fennec*.py')
+                #c.globs.append('release-thunderbird*.py')
             c.globs.append(mastercfg)
             c.globs.append('build_localconfig.py')
-            c.local_links.append((mastercfg, 'master.cfg'))
+            c.globs.append('master-main.cfg')
+            #c.local_links.append((mastercfg, 'master.cfg'))
             c.local_links.append(
                 ('build_localconfig.py', 'master_localconfig.py'))
         elif m['role'] == 'try':
             c.config_dir = 'mozilla'
             c.local_links.append((mastercfg, 'master.cfg'))
             c.local_links.append(
                 ('try_localconfig.py', 'master_localconfig.py'))
             c.globs.append(mastercfg)