merged from default

changeset: 2356:2c3f558e4d7b tag: tip parent: 2353:12a44c7cc07e user: Chris AtLee <catlee@mozilla.com> date: Wed Dec 21 11:03:18 2011 -0500 summary: Bug 558180: Have release build factories use in-tree mozconfigs. r=rail --HG-- branch : production-0.8
mozilla-releng · Dec 21, 2011 · eca6cb6 · eca6cb6
2 parents 633266b + 05f6391
commit eca6cb6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/process/release.py b/process/release.py
@@ -811,6 +811,7 @@ def majorUpdateVerifyBuilders(platform):
                 configSubDir=branchConfig['config_subdir'],
                 profiledBuild=pf['profiled_build'],
                 mozconfig=mozconfig,
+                srcMozconfig=releaseConfig.get('mozconfigs', {}).get(platform),
                 buildRevision=releaseTag,
                 stageServer=branchConfig['stage_server'],
                 stageUsername=branchConfig['stage_username'],
@@ -971,6 +972,7 @@ def majorUpdateVerifyBuilders(platform):
                 configSubDir=branchConfig['config_subdir'],
                 profiledBuild=None,
                 mozconfig = '%s/%s/xulrunner' % (platform, sourceRepoInfo['name']),
+                srcMozconfig=releaseConfig.get('xulrunner_mozconfigs', {}).get(platform),
                 buildRevision=releaseTag,
                 stageServer=branchConfig['stage_server'],
                 stageUsername=branchConfig['stage_username_xulrunner'],