Use buildbot_wrangler.py

mozilla · Jul 13, 2011 · c60ff81 · c60ff81
1 parent e45c146
commit c60ff81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/master/master.cfg b/master/master.cfg
@@ -35,6 +35,7 @@ repos = {'build/buildbot': 'default',
 
 master_dirs = ('scheduler-master', 'builder-master', 'tests-scheduler-master',
           'tests-master')
+buildbot_wrangler = '../tools/buildfarm/maintenance/buildbot-wrangler.py'
 
 c = BuildmasterConfig = {}
 c['projectName'] = "Mozilla"
@@ -90,7 +91,8 @@ for r in ('buildbotcustom/buildbotcustom', 'buildbot-configs', 'tools'):
     f.run_on_master('/builds/buildbot/%s' % r, 'hg pull -u')
 
 for d in master_dirs:
-    f.run_on_master('/builds/buildbot/%s' % d, 'make reconfig')
+    f.run_on_master('/builds/buildbot/%s' % d,
+                    '%s reconfig /builds/buildbot/%s' % (buildbot_wrangler, d))
 
 test_masters_builder = BuilderConfig(name='test-masters',
                                      slavename='myself',
@@ -99,13 +101,15 @@ test_masters_builder = BuilderConfig(name='test-masters',
 
 w = PPBuildFactory(HG_HOST)
 for d in master_dirs:
-    w.run_on_master('/builds/buildbot/%s' % d, 'make stop')
+    w.run_on_master('/builds/buildbot/%s' % d,
+                    '%s stop /builds/buildbot/%s' % (buildbot_wrangler, d))
     w.setup_virtualenv(workdir='/builds/buildbot/%s/sandbox' % d)
 
 w.run_on_master('/builds/buildbot/preproduction', './db-cleanup.py')
 
 for d in master_dirs:
-    w.run_on_master('/builds/buildbot/%s' % d, 'make start')
+    w.run_on_master('/builds/buildbot/%s' % d,
+                    '%s start /builds/buildbot/%s' % (buildbot_wrangler, d))
 
 setup_masters = {'name': 'setup-masters',
                  'slavename': 'myself',

diff --git a/master/release_master.py b/master/release_master.py
@@ -130,7 +130,7 @@ def previousSetupExists(step):
                          '--username', 'preproduction',
                          '--master', rmConfig['releaseMasterHostPort'],
                          '--branch', WithProperties('%(release_branch)s'),
-                         '-p', 'release_config:%s' % release_config,
+                         '-p', 'products:firefox',
                          '-p',  WithProperties(
                              'script_repo_revision:%(release_tag)s'),
                          'release_build'],