Permalink
Browse files

Update according new server env

  • Loading branch information...
1 parent 1f705f9 commit a0bb4d7cd651226113a08988dcc8dc6d2d076f7a @rail rail committed Apr 12, 2012
Showing with 13 additions and 13 deletions.
  1. +1 −1 master/master.cfg
  2. +4 −4 master/preproduction_factory.py
  3. +2 −2 master/release_config.py
  4. +5 −5 master/release_master.py
  5. +1 −1 slave/Makefile
View
2 master/master.cfg
@@ -40,7 +40,7 @@ buildbot_wrangler = '../tools/buildfarm/maintenance/buildbot-wrangler.py'
c = BuildmasterConfig = {}
c['projectName'] = "Mozilla"
c['projectURL'] = "http://www.mozilla.org"
-c['buildbotURL'] = "http://preproduction-master.build.mozilla.org:8710/"
+c['buildbotURL'] = "http://preproduction-master.srv.releng.scl3.mozilla.com:8710/"
c['db_url'] = "sqlite:///state.sqlite"
c['slavePortnum'] = 9710
c['slaves'] = [BuildSlave("myself", "passwd")]
View
8 master/preproduction_factory.py
@@ -91,8 +91,8 @@ def setup_virtualenv(self, workdir='%(topdir)s/sandbox'):
self.addStep(ShellCommand(
name='setup_sandbox',
command=['make', '-f', 'Makefile.setup',
- 'PYTHON=/tools/python/bin/python',
- 'VIRTUALENV=/tools/python/bin/virtualenv',
+ 'PYTHON=python2.6',
+ 'VIRTUALENV=virtualenv-2.6',
'MASTER_NAME=fake',
WithProperties('BASEDIR=%s' % workdir),
'BUILDBOTCUSTOM_BRANCH=default',
@@ -169,7 +169,7 @@ def tools_run_tests(self):
workdir='tools/clobberer',
name='clobbberer_test',
command=['python', 'test_clobberer.py',
- 'http://preproduction-master.build.mozilla.org/~cltbld/index.php',
+ 'http://preproduction-master.srv.releng.scl3.mozilla.com/~cltbld/index.php',
'/home/cltbld/public_html/db/clobberer.db'],
))
@@ -243,6 +243,6 @@ def coverage(self, project):
command=['rsync', '-av', '--delete', '-e',
'ssh -o IdentityFile=~/.ssh/id_rsa -l cltbld -o BatchMode=yes',
'html/%s/' % project,
- 'preproduction-stage.build.mozilla.org:/var/www/html/coverage/%s/' % project],
+ 'preproduction-stage.srv.releng.scl3.mozilla.com:/var/www/html/coverage/%s/' % project],
workdir='.',
))
View
4 master/release_config.py
@@ -6,8 +6,8 @@
rmConfig['releaseMasterHostPort'] = 'localhost:9020'
rmConfig['HG_HOST'] = 'hg.mozilla.org'
-rmConfig['PYTHON'] = '/tools/python/bin/python'
-rmConfig['VIRTUALENV'] = '/tools/python/bin/virtualenv'
+rmConfig['PYTHON'] = 'python2.6'
+rmConfig['VIRTUALENV'] = 'virtualenv-2.6'
rmConfig['HG_DIR'] = 'users/prepr-ffxbld'
rmConfig['MASTER_NAME'] = 'preprod-release-master'
rmConfig['BUILDBOTCUSTOM_BRANCH'] = 'default'
View
10 master/release_master.py
@@ -27,7 +27,7 @@ def __init__(self, rmConfig, **kwargs):
haltOnFailure=True,
))
self.addStep(ShellCommand(
- command=['python', 'scripts/preproduction/repo_setup.py', '-c',
+ command=[rmConfig['PYTHON'], 'scripts/preproduction/repo_setup.py', '-c',
'scripts/preproduction/repo_setup_config.py'],
workdir='tools',
haltOnFailure=True,
@@ -47,7 +47,7 @@ def previousSetupExists(step):
and len(step.build.getProperty('previousSetupMakefile')) > 0
self.addStep(ShellCommand(
- command=['python',
+ command=[rmConfig['PYTHON'],
'tools/buildfarm/maintenance/buildbot-wrangler.py',
'stop', '%s/master' % rmConfig['releaseMasterDir']],
workdir=rmConfig['releaseMasterDir'],
@@ -102,23 +102,23 @@ def previousSetupExists(step):
workdir='%s/master' % rmConfig['releaseMasterDir'],
))
self.addStep(ShellCommand(
- command=['python',
+ command=[rmConfig['PYTHON'],
'tools/buildfarm/maintenance/buildbot-wrangler.py',
'start', '%s/master' % rmConfig['releaseMasterDir']],
workdir=rmConfig['releaseMasterDir'],
))
for release_config in rmConfig['releaseConfigs']:
self.addStep(SetProperty(
property='release_tag',
- command=['python', '-c',
+ command=[rmConfig['PYTHON'], '-c',
'execfile("%s"); \
print releaseConfig["baseTag"] + "_RELEASE"' %
release_config],
workdir='%s/buildbot-configs' % rmConfig['releaseMasterDir'],
))
self.addStep(SetProperty(
property='release_branch',
- command=['python', '-c',
+ command=[rmConfig['PYTHON'], '-c',
'execfile("%s"); \
print releaseConfig["sourceRepositories"]["mozilla"]["path"]' %
release_config],
View
2 slave/Makefile
@@ -1,6 +1,6 @@
# -*- makefile -*-
-export PATH=$(shell pwd)/../sandbox/bin:/bin:/usr/bin
+export PATH=$(shell pwd)/../sandbox_slave/bin:/bin:/usr/bin
start:
buildslave start .

0 comments on commit a0bb4d7

Please sign in to comment.