Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

changeset: 2321:5ecf7eb36c29

parent:      2317:e0c0fd23f72a
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Fri May 11 09:32:11 2012 -0700
summary:     bug 701783 - remove scratchbox references from buildbotcustom. r=catlee

changeset:   2323:d22a18631658
parent:      2321:5ecf7eb36c29
user:        Chris AtLee <catlee@mozilla.com>
date:        Mon May 14 09:35:30 2012 -0400
summary:     Bug 753132: Support 'pgo_platform' key for deciding which machines do PGO builds. r=rail

changeset:   2324:dc2724ce42f5
user:        John Hopkins <jhopkins@mozilla.com>
date:        Mon May 14 10:51:49 2012 -0400
summary:     Bug 754430 - Missing mozilla/ dir in Thunderbird beta build. p=standard8,r=jhopkins

changeset:   2325:36b6b4b6d9d4
tag:         tip
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Mon May 14 11:23:12 2012 -0400
summary:     Bug 750744: Test and deploy SUT agent 1.08. r=bear

--HG--
branch : production-0.8
  • Loading branch information...
commit f332deb622a0679668525e85cbd082208355d161 2 parents e584d6c + e574736
Armen Zambrano armenzg authored
Showing with 41 additions and 28 deletions.
  1. +18 −26 misc.py
  2. +18 −2 process/factory.py
  3. +5 −0 process/release.py
44 misc.py
View
@@ -996,8 +996,13 @@ def generateBranchObjects(config, name, secrets=None):
# All platforms that can't do PGO... shouldn't do PGO.
per_checkin_build_uses_pgo = False
+ slaves = pf['slaves']
+ env = pf['env']
if per_checkin_build_uses_pgo:
per_checkin_unittest_branch = pgoUnittestBranch
+ if 'pgo_platform' in pf:
+ slaves = config['platforms'][pf['pgo_platform']]['slaves']
+ env = config['platforms'][pf['pgo_platform']]['env']
else:
per_checkin_unittest_branch = unittestBranch
@@ -1009,7 +1014,7 @@ def generateBranchObjects(config, name, secrets=None):
# Some platforms shouldn't do dep builds (i.e. RPM)
if pf.get('enable_dep', True):
factory_kwargs = {
- 'env': pf['env'],
+ 'env': env,
'objdir': pf['platform_objdir'],
'platform': platform,
'hgHost': config['hghost'],
@@ -1069,17 +1074,12 @@ def generateBranchObjects(config, name, secrets=None):
}
factory_kwargs.update(extra_args)
- if name in ('mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-2.0'):
- # We force profiledBuild off here because its meaning has changed
- # We deal with turning on PGO for these old branches in the actual factory
- factory_kwargs['profiledBuild'] = False
-
mozilla2_dep_factory = factory_class(**factory_kwargs)
#eg. TB Linux comm-central build
# TB Linux comm-central leak test build
mozilla2_dep_builder = {
'name': '%s build' % pf['base_name'],
- 'slavenames': pf['slaves'],
+ 'slavenames': slaves,
'builddir': '%s-%s' % (name, platform),
'slavebuilddir': reallyShort('%s-%s' % (name, platform), pf['stage_product']),
'factory': mozilla2_dep_factory,
@@ -1106,7 +1106,7 @@ def generateBranchObjects(config, name, secrets=None):
pgo_factory = factory_class(**pgo_kwargs)
pgo_builder = {
'name': '%s pgo-build' % pf['base_name'],
- 'slavenames': pf['slaves'],
+ 'slavenames': pf.get('pgo_slaves', pf['slaves']),
'builddir': '%s-%s-pgo' % (name, platform),
'slavebuilddir': reallyShort('%s-%s-pgo' % (name, platform), pf['stage_product']),
'factory': pgo_factory,
@@ -1255,18 +1255,17 @@ def generateBranchObjects(config, name, secrets=None):
# branches get some PGO coverage
# We do not stick '-pgo' in the stage_platform for
# nightlies because it'd be ugly and break stuff
+ slaves = pf['slaves']
+
if platform in config['pgo_platforms']:
nightly_pgo = True
nightlyUnittestBranch = pgoUnittestBranch
+ if 'pgo_platform' in pf:
+ slaves = config['platforms'][pf['pgo_platform']]['slaves']
else:
nightlyUnittestBranch = unittestBranch
nightly_pgo = False
- # More 191,192,20 special casing
- if name in ('mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-2.0'):
- nightlyUnittestBranch = unittestBranch
- nightly_pgo = False
-
mozilla2_nightly_factory = NightlyBuildFactory(
env=platform_env,
objdir=pf['platform_objdir'],
@@ -1335,7 +1334,7 @@ def generateBranchObjects(config, name, secrets=None):
#eg. TB Linux comm-aurora nightly
mozilla2_nightly_builder = {
'name': nightly_builder,
- 'slavenames': pf['slaves'],
+ 'slavenames': slaves,
'builddir': '%s-%s-nightly' % (name, platform),
'slavebuilddir': reallyShort('%s-%s-nightly' % (name, platform), pf['stage_product']),
'factory': mozilla2_nightly_factory,
@@ -1428,10 +1427,7 @@ def generateBranchObjects(config, name, secrets=None):
branchObjects['builders'].append(mozilla2_l10n_nightly_builder)
if config['enable_shark'] and pf.get('enable_shark'):
- if name in ('mozilla-1.9.1','mozilla-1.9.2'):
- shark_objdir = config['objdir']
- else:
- shark_objdir = pf['platform_objdir']
+ shark_objdir = pf['platform_objdir']
mozilla2_shark_factory = NightlyBuildFactory(
env=platform_env,
objdir=shark_objdir,
@@ -2470,6 +2466,10 @@ def generateCCBranchObjects(config, name, secrets=None):
nightly_builder = '%s nightly' % pf['base_name']
platform_env = pf['env'].copy()
+ if platform in config['pgo_platforms']:
+ if 'pgo_platform' in pf:
+ platform_env = config['platforms'][pf['pgo_platform']]['env'].copy()
+
if 'update_channel' in config and config.get('create_snippet'):
platform_env['MOZ_UPDATE_CHANNEL'] = config['update_channel']
@@ -3534,10 +3534,6 @@ def generateNanojitObjects(config, SLAVES):
slaves = SLAVES[platform]
nanojit_script = 'scripts/nanojit/nanojit.sh'
interpreter = 'bash'
- elif 'arm' in platform:
- slaves = SLAVES['linux']
- nanojit_script = '/builds/slave/nanojit-arm/scripts/scripts/nanojit/nanojit.sh'
- interpreter = ['/scratchbox/moz_scratchbox', '-d', '/builds/slave/nanojit-arm']
else:
slaves = SLAVES[platform]
nanojit_script = 'scripts/nanojit/nanojit.sh'
@@ -3608,10 +3604,6 @@ def generateSpiderMonkeyObjects(config, SLAVES):
elif 'lion' in platform:
slaves = SLAVES['macosx64-lion']
interpreter = None
- elif 'arm' in platform:
- slaves = SLAVES['linux']
- interpreter = ['/scratchbox/moz_scratchbox', '-d',
- '/builds/slave/%s' % reallyShort('%s_%s_spidermonkey-%s' % (branch, platform, variant))]
else:
slaves = SLAVES[base_platform]
interpreter = None
20 process/factory.py
View
@@ -7091,10 +7091,18 @@ def addInitialSteps(self):
haltOnFailure=True,
))
self.addStep(RetryingShellCommand(
+ name='get_sut_lib_py',
+ description="Download sut_lib.py",
+ command=['wget', '--no-check-certificate', '-O', 'sut_lib.py',
+ 'http://hg.mozilla.org/build/tools/raw-file/5e8bc65670cc/sut_tools/sut_lib.py'],
+ workdir='build',
+ haltOnFailure=True,
+ ))
+ self.addStep(RetryingShellCommand(
name='get_updateSUT_py',
description="Download updateSUT.py",
command=['wget', '--no-check-certificate', '-O', 'updateSUT.py',
- 'http://hg.mozilla.org/build/tools/raw-file/eba35f2aeabd/sut_tools/updateSUT.py'],
+ 'http://hg.mozilla.org/build/tools/raw-file/16fc4f354b44/sut_tools/updateSUT.py'],
workdir='build',
haltOnFailure=True,
))
@@ -7768,9 +7776,17 @@ def addSetupSteps(self):
haltOnFailure=True,
))
self.addStep(RetryingShellCommand(
+ name='get_sut_lib_py',
+ description="Download sut_lib.py",
+ command=['wget', '--no-check-certificate', '-O', 'sut_lib.py',
+ 'http://hg.mozilla.org/build/tools/raw-file/5e8bc65670cc/sut_tools/sut_lib.py'],
+ workdir=self.workdirBase,
+ haltOnFailure=True,
+ ))
+ self.addStep(RetryingShellCommand(
name='get_updateSUT_py',
command=['wget', '--no-check-certificate', '-O', 'updateSUT.py',
- 'http://hg.mozilla.org/build/tools/raw-file/eba35f2aeabd/sut_tools/updateSUT.py'],
+ 'http://hg.mozilla.org/build/tools/raw-file/16fc4f354b44/sut_tools/updateSUT.py'],
workdir=self.workdirBase,
haltOnFailure=True,
))
5 process/release.py
View
@@ -547,6 +547,10 @@ def majorUpdateVerifyBuilders(platform):
))
xr_deliverables_builders.append(builderPrefix('xulrunner_source'))
+ mozillaDir = None
+ if 'mozilla_dir' in releaseConfig:
+ mozillaDir = releaseConfig['mozilla_dir']
+
for platform in releaseConfig['enUSPlatforms']:
# shorthand
pf = branchConfig['platforms'][platform]
@@ -636,6 +640,7 @@ def majorUpdateVerifyBuilders(platform):
signingServers=signingServers,
enableSigning=releaseConfig.get('enableSigningAtBuildTime', True),
createPartial=releaseConfig.get('enablePartialMarsAtBuildTime', True),
+ mozillaDir=mozillaDir,
)
builders.append({
Please sign in to comment.
Something went wrong with that request. Please try again.