--- a/mozilla-tests/tests_master.cfg
+++ b/mozilla-tests/tests_master.cfg
@@ -54,34 +54,11 @@ import passwords
reload(passwords)
from passwords import BBDB_URL
c['db_url'] = BBDB_URL
c['db_poll_interval'] = 60
c['multiMaster'] = True
c['mergeRequests'] = buildbotcustom.misc.mergeRequests
-# Give the release builders highest priority, then all branches priority over try
-def prioritizeBuilders(botmaster, builders):
- def sortkey(builder):
- builds = builder.getBuildable()
- if builds:
- req_priority = -builds[0].priority
- submitted_at = builds[0].submittedAt
- else:
- req_priority = 0
- submitted_at = None
-
- if builder.builder_status.category.endswith('-release'):
- priority = 0
- elif builder.builder_status.category == 'tryserver':
- priority = 2
- else:
- priority = 1
-
- return priority, req_priority, submitted_at
- builders.sort(key=sortkey)
- return builders
-c['prioritizeBuilders'] = prioritizeBuilders
-
# c is shorthand for BuildmasterConfig, so make sure they still refer to the
# same thing
assert c is BuildmasterConfig
--- a/mozilla-tests/universal_master_sqlite.cfg
+++ b/mozilla-tests/universal_master_sqlite.cfg
@@ -47,34 +47,11 @@ for branch in ACTIVE_BRANCHES:
# Required for sendchange
from buildbot.changes.pb import PBChangeSource
c['change_source'].append(PBChangeSource())
c['db_url'] = "sqlite:///state.sqlite"
c['mergeRequests'] = buildbotcustom.misc.mergeRequests
-# Give the release builders highest priority, then all branches priority over try
-def prioritizeBuilders(botmaster, builders):
- def sortkey(builder):
- builds = builder.getBuildable()
- if builds:
- req_priority = -builds[0].priority
- submitted_at = builds[0].submittedAt
- else:
- req_priority = 0
- submitted_at = None
-
- if builder.builder_status.category.endswith('-release'):
- priority = 0
- elif builder.builder_status.category == 'tryserver':
- priority = 2
- else:
- priority = 1
-
- return priority, req_priority, submitted_at
- builders.sort(key=sortkey)
- return builders
-c['prioritizeBuilders'] = prioritizeBuilders
-
# c is shorthand for BuildmasterConfig, so make sure they still refer to the
# same thing
assert c is BuildmasterConfig
--- a/mozilla/builder_master.cfg
+++ b/mozilla/builder_master.cfg
@@ -78,36 +78,11 @@ import passwords
reload(passwords)
from passwords import BBDB_URL
c['db_url'] = BBDB_URL
c['db_poll_interval'] = 60
c['multiMaster'] = True
c['mergeRequests'] = buildbotcustom.misc.mergeRequests
-# Give the release builders priority over other builders
-def prioritizeBuilders(botmaster, builders):
- def sortkey(builder):
- builds = builder.getBuildable()
- if builds:
- # The builder that gets sorted first, gets run first, but the build
- # request priorities are in ascending order (higher priority gets
- # run next), so flip the sign of the priority so that higher
- # priorities sort to the front
- req_priority = -builds[0].priority
- submitted_at = builds[0].submittedAt
- else:
- req_priority = 0
- submitted_at = None
-
- if builder.builder_status.category.startswith('release'):
- priority = 0
- else:
- priority = 1
-
- return priority, req_priority, submitted_at
- builders.sort(key=sortkey)
- return builders
-c['prioritizeBuilders'] = prioritizeBuilders
-
# c is shorthand for BuildmasterConfig, so make sure they still refer to the
# same thing
assert c is BuildmasterConfig
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -97,32 +97,16 @@ GLOBAL_VARS = {
'sync/services',
],
'scratchbox_path': '/builds/scratchbox/moz_scratchbox',
'scratchbox_home': '/scratchbox/users/cltbld/home/cltbld',
}
GLOBAL_VARS.update(localconfig.GLOBAL_VARS.copy())
-PROJECTS = {
- 'fuzzing': {
- 'platforms': ['linux', 'linux64', 'macosx', 'macosx64', 'win32'],
- },
- 'nanojit': {
- 'platforms': ['linux', 'linux64', 'macosx', 'macosx64', 'win32', 'arm'],
- 'hgurl': 'http://hg.mozilla.org',
- 'repo_path': 'projects/nanojit-central',
- },
-}
-for k, v in localconfig.PROJECTS.items():
- if k not in PROJECTS:
- PROJECTS[k] = {}
- for k1, v1 in v.items():
- PROJECTS[k][k1] = v1
-
# shorthand, because these are used often
OBJDIR = GLOBAL_VARS['objdir']
MOBILE_OBJDIR = GLOBAL_VARS['mobile_objdir']
SYMBOL_SERVER_PATH = GLOBAL_VARS['symbol_server_path']
SYMBOL_SERVER_MOBILE_PATH = GLOBAL_VARS['symbol_server_mobile_path']
MOBILE_PLATFORM_VARS = {
'maemo5-gtk':{
@@ -573,16 +557,39 @@ PLATFORM_VARS = {
'MOZ_CRASHREPORTER_NO_REPORT': '1',
},
'enable_unittests': True,
'enable_checktests': True,
'talos_masters': GLOBAL_VARS['talos_masters'],
},
}
+PROJECTS = {
+ 'fuzzing': {
+ 'platforms': ['linux', 'linux64', 'macosx', 'macosx64', 'win32'],
+ },
+ 'nanojit': {
+ 'platforms': ['linux', 'linux64', 'macosx', 'macosx64', 'win32', 'arm'],
+ 'hgurl': 'http://hg.mozilla.org',
+ 'repo_path': 'projects/nanojit-central',
+ },
+ 'valgrind': {
+ 'platforms': ['linux', 'linux64'],
+ 'job_interval': 24*3600, # Once a day
+ 'linux': {'env': PLATFORM_VARS['linux']['env']},
+ 'linux64': {'env': PLATFORM_VARS['linux']['env']},
+ },
+}
+for k, v in localconfig.PROJECTS.items():
+ if k not in PROJECTS:
+ PROJECTS[k] = {}
+ for k1, v1 in v.items():
+ PROJECTS[k][k1] = v1
+
+
# All branches that are to be built MUST be listed here, along with their
# platforms (if different from the default set).
BRANCHES = {
'mozilla-central': {
'mobile_platforms': {
'android-r7': {},
'android-r7-nothumb': {},
}
--- a/mozilla/master_common.py
+++ b/mozilla/master_common.py
@@ -8,8 +8,35 @@ c['eventHorizon'] = 20
c['buildCacheSize'] = 10
c['changeCacheSize'] = 10000
c['status'] = []
c['slaves'] = []
c['builders'] = []
c['schedulers'] = []
c['change_source'] = []
+
+# Give the release builders priority over other builders
+def prioritizeBuilders(botmaster, builders):
+ def sortkey(builder):
+ builds = builder.getBuildable(1)
+ if builds:
+ # The builder that gets sorted first, gets run first, but the build
+ # request priorities are in ascending order (higher priority gets
+ # run next), so flip the sign of the priority so that higher
+ # priorities sort to the front
+ req_priority = -builds[0].priority
+ submitted_at = builds[0].submittedAt
+ else:
+ req_priority = 0
+ submitted_at = None
+
+ if builder.builder_status.category.startswith('release'):
+ priority = 0
+ elif builder.builder_status.category.startswith('try'):
+ priority = 2
+ else:
+ priority = 1
+
+ return priority, req_priority, submitted_at
+ builders.sort(key=sortkey)
+ return builders
+c['prioritizeBuilders'] = prioritizeBuilders
--- a/mozilla/preproduction_config.py
+++ b/mozilla/preproduction_config.py
@@ -98,9 +98,14 @@ PROJECTS = {
'fuzzing_base_dir': '/mnt/eql/builds/firefox/pvt-builds/fuzzing/',
'idle_slaves': 0,
},
'nanojit': {
'scripts_repo': 'http://hg.mozilla.org/build/tools',
'idle_slaves': 0,
'tinderbox_tree': 'Releng-Preproduction',
},
+ 'valgrind': {
+ 'scripts_repo': 'http://hg.mozilla.org/build/tools',
+ 'idle_slaves': 0,
+ 'tinderbox_tree': 'Releng-Preproduction',
+ },
}
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -182,9 +182,14 @@ PROJECTS = {
'fuzzing_base_dir': '//mnt/pvt_builds/fuzzing/',
'idle_slaves': 3,
},
'nanojit': {
'scripts_repo': 'http://hg.mozilla.org/build/tools',
'idle_slaves': 3,
'tinderbox_tree': 'Nanojit',
},
+ 'valgrind': {
+ 'scripts_repo': 'http://hg.mozilla.org/build/tools',
+ 'idle_slaves': 5, # 5 slaves have to be idle before we start
+ 'tinderbox_tree': 'Firefox',
+ },
}
--- a/mozilla/release-firefox-mozilla-1.9.1.py
+++ b/mozilla/release-firefox-mozilla-1.9.1.py
@@ -7,17 +7,18 @@ releaseConfig['sourceRepoPath'] = '
releaseConfig['sourceRepoRevision'] = '612ad84a4004'
releaseConfig['relbranchOverride'] = 'GECKO19116_20101122_RELBRANCH'
releaseConfig['l10nRepoPath'] = 'releases/l10n-mozilla-1.9.1'
releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-1.9.1'
releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
releaseConfig['l10nChunks'] = 6
releaseConfig['mergeLocales'] = False
releaseConfig['otherReposToTag'] = {
- 'build/compare-locales': 'RELEASE_AUTOMATION'
+ 'build/compare-locales': 'RELEASE_AUTOMATION',
+ 'build/buildbot': 'production-0.8'
}
releaseConfig['cvsroot'] = ':ext:cltbld@cvs.mozilla.org:/cvsroot'
releaseConfig['productName'] = 'firefox'
releaseConfig['appName'] = 'browser'
# Sometimes we need the application version to be different from what we "call"
# the build, eg public release candidates for a major release (3.1 RC1).
# appVersion and oldAppVersion are optional definitions used in places that
# don't care about what we call it. Eg, when version bumping we will bump to
--- a/mozilla/release-firefox-mozilla-1.9.2.py
+++ b/mozilla/release-firefox-mozilla-1.9.2.py
@@ -7,17 +7,19 @@ releaseConfig['sourceRepoPath'] = '
releaseConfig['sourceRepoRevision'] = '0c159bd1d600'
releaseConfig['relbranchOverride'] = 'GECKO19213_20101122_RELBRANCH'
releaseConfig['l10nRepoPath'] = 'releases/l10n-mozilla-1.9.2'
releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-1.9.2'
releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
releaseConfig['l10nChunks'] = 6
releaseConfig['mergeLocales'] = False
releaseConfig['otherReposToTag'] = {
- 'build/compare-locales': 'RELEASE_AUTOMATION'
+ 'build/compare-locales': 'RELEASE_AUTOMATION',
+ 'build/buildbot': 'production-0.8',
+ 'build/partner-repacks': 'default'
}
releaseConfig['cvsroot'] = ':ext:cltbld@cvs.mozilla.org:/cvsroot'
releaseConfig['productName'] = 'firefox'
releaseConfig['appName'] = 'browser'
# Sometimes we need the application version to be different from what we "call"
# the build, eg public release candidates for a major release (3.1 RC1).
# appVersion and oldAppVersion are optional definitions used in places that
# don't care about what we call it. Eg, when version bumping we will bump to
--- a/mozilla/release-firefox-mozilla-2.0.py
+++ b/mozilla/release-firefox-mozilla-2.0.py
@@ -6,17 +6,18 @@ releaseConfig['sourceRepoName'] = '
releaseConfig['sourceRepoPath'] = releaseConfig['sourceRepoName']
releaseConfig['sourceRepoRevision'] = '633e895d5e84'
releaseConfig['relbranchOverride'] = 'GECKO20b5_20100831_RELBRANCH'
releaseConfig['l10nRepoPath'] = 'l10n-central'
releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-2.0'
releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
releaseConfig['mergeLocales'] = True
releaseConfig['otherReposToTag'] = {
- 'build/compare-locales': 'RELEASE_AUTOMATION'
+ 'build/compare-locales': 'RELEASE_AUTOMATION',
+ 'build/buildbot': 'production-0.8'
}
releaseConfig['cvsroot'] = ':ext:cltbld@cvs.mozilla.org:/cvsroot'
releaseConfig['productName'] = 'firefox'
releaseConfig['appName'] = 'browser'
# Sometimes we need the application version to be different from what we "call"
# the build, eg public release candidates for a major release (3.1 RC1).
# appVersion and oldAppVersion are optional definitions used in places that
# don't care about what we call it. Eg, when version bumping we will bump to
--- a/mozilla/release-firefox-mozilla-central.py
+++ b/mozilla/release-firefox-mozilla-central.py
@@ -6,17 +6,18 @@ releaseConfig['sourceRepoName'] = '
releaseConfig['sourceRepoPath'] = releaseConfig['sourceRepoName']
releaseConfig['sourceRepoRevision'] = '633e895d5e84'
releaseConfig['relbranchOverride'] = 'GECKO20b5_20100831_RELBRANCH'
releaseConfig['l10nRepoPath'] = 'l10n-central'
releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-2.0'
releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
releaseConfig['mergeLocales'] = True
releaseConfig['otherReposToTag'] = {
- 'build/compare-locales': 'RELEASE_AUTOMATION'
+ 'build/compare-locales': 'RELEASE_AUTOMATION',
+ 'build/buildbot': 'production-0.8'
}
releaseConfig['cvsroot'] = ':ext:cltbld@cvs.mozilla.org:/cvsroot'
releaseConfig['productName'] = 'firefox'
releaseConfig['appName'] = 'browser'
# Sometimes we need the application version to be different from what we "call"
# the build, eg public release candidates for a major release (3.1 RC1).
# appVersion and oldAppVersion are optional definitions used in places that
# don't care about what we call it. Eg, when version bumping we will bump to
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -123,9 +123,14 @@ PROJECTS = {
'fuzzing_base_dir': '//mnt/pvt_builds/staging/fuzzing/',
'idle_slaves': 0,
},
'nanojit': {
'scripts_repo': 'http://hg.mozilla.org/build/tools',
'idle_slaves': 0,
'tinderbox_tree': 'MozillaTest',
},
+ 'valgrind': {
+ 'scripts_repo': 'http://hg.mozilla.org/build/tools',
+ 'idle_slaves': 0,
+ 'tinderbox_tree': 'MozillaTest',
+ },
}
--- a/mozilla/staging_release-firefox-mozilla-1.9.1.py
+++ b/mozilla/staging_release-firefox-mozilla-1.9.1.py
@@ -8,17 +8,18 @@ releaseConfig['sourceRepoPath'] = '
releaseConfig['sourceRepoRevision'] = 'dc338f6c00de'
releaseConfig['relbranchOverride'] = 'GECKO19114_20100930_RELBRANCH'
releaseConfig['l10nRepoClonePath'] = 'releases/l10n-mozilla-1.9.1'
releaseConfig['l10nRepoPath'] = 'users/stage-ffxbld'
releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-1.9.1'
releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
releaseConfig['mergeLocales'] = False
releaseConfig['otherReposToTag'] = {
- 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION'
+ 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
+ 'users/stage-ffxbld/buildbot': 'production-0.8'
}
releaseConfig['cvsroot'] = ':ext:stgbld@cvs.mozilla.org:/cvsroot'
releaseConfig['productName'] = 'firefox'
releaseConfig['appName'] = 'browser'
# Sometimes we need the application version to be different from what we "call"
# the build, eg public release candidates for a major release (3.1 RC1).
# appVersion and oldAppVersion are optional definitions used in places that
# don't care about what we call it. Eg, when version bumping we will bump to
--- a/mozilla/staging_release-firefox-mozilla-1.9.2.py
+++ b/mozilla/staging_release-firefox-mozilla-1.9.2.py
@@ -8,17 +8,19 @@ releaseConfig['sourceRepoPath'] = '
releaseConfig['sourceRepoRevision'] = '2cfbdde77508'
releaseConfig['relbranchOverride'] = 'GECKO19211_20100930_RELBRANCH'
releaseConfig['l10nRepoClonePath'] = 'releases/l10n-mozilla-1.9.2'
releaseConfig['l10nRepoPath'] = 'users/stage-ffxbld'
releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-1.9.2'
releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
releaseConfig['mergeLocales'] = False
releaseConfig['otherReposToTag'] = {
- 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION'
+ 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
+ 'users/stage-ffxbld/buildbot': 'production-0.8',
+ 'users/stage-ffxbld/partner-repacks': 'default'
}
releaseConfig['cvsroot'] = ':ext:stgbld@cvs.mozilla.org:/cvsroot'
releaseConfig['productName'] = 'firefox'
releaseConfig['appName'] = 'browser'
# Sometimes we need the application version to be different from what we "call"
# the build, eg public release candidates for a major release (3.1 RC1).
# appVersion and oldAppVersion are optional definitions used in places that
# don't care about what we call it. Eg, when version bumping we will bump to
--- a/mozilla/staging_release-firefox-mozilla-2.0.py
+++ b/mozilla/staging_release-firefox-mozilla-2.0.py
@@ -8,17 +8,18 @@ releaseConfig['sourceRepoPath'] = '
releaseConfig['sourceRepoRevision'] = '633e895d5e84'
releaseConfig['relbranchOverride'] = 'GECKO20b5_20100831_RELBRANCH'
releaseConfig['l10nRepoClonePath'] = 'l10n-central'
releaseConfig['l10nRepoPath'] = 'users/stage-ffxbld'
releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-2.0'
releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
releaseConfig['mergeLocales'] = True
releaseConfig['otherReposToTag'] = {
- 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION'
+ 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
+ 'users/stage-ffxbld/buildbot': 'production-0.8'
}
releaseConfig['cvsroot'] = ':ext:stgbld@cvs.mozilla.org:/cvsroot'
releaseConfig['productName'] = 'firefox'
releaseConfig['appName'] = 'browser'
# Sometimes we need the application version to be different from what we "call"
# the build, eg public release candidates for a major release (3.1 RC1).
# appVersion and oldAppVersion are optional definitions used in places that
# don't care about what we call it. Eg, when version bumping we will bump to
--- a/mozilla/staging_release-firefox-mozilla-central.py
+++ b/mozilla/staging_release-firefox-mozilla-central.py
@@ -8,17 +8,18 @@ releaseConfig['sourceRepoPath'] = '
releaseConfig['sourceRepoRevision'] = '633e895d5e84'
releaseConfig['relbranchOverride'] = 'GECKO20b5_20100831_RELBRANCH'
releaseConfig['l10nRepoClonePath'] = 'l10n-central'
releaseConfig['l10nRepoPath'] = 'users/stage-ffxbld'
releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-2.0'
releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
releaseConfig['mergeLocales'] = True
releaseConfig['otherReposToTag'] = {
- 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION'
+ 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
+ 'users/stage-ffxbld/buildbot': 'production-0.8'
}
releaseConfig['cvsroot'] = ':ext:stgbld@cvs.mozilla.org:/cvsroot'
releaseConfig['productName'] = 'firefox'
releaseConfig['appName'] = 'browser'
# Sometimes we need the application version to be different from what we "call"
# the build, eg public release candidates for a major release (3.1 RC1).
# appVersion and oldAppVersion are optional definitions used in places that
# don't care about what we call it. Eg, when version bumping we will bump to
--- a/mozilla/universal_master_sqlite.cfg
+++ b/mozilla/universal_master_sqlite.cfg
@@ -72,36 +72,11 @@ if ENABLE_RELEASES:
from buildbot.changes.pb import PBChangeSource
if len([cs for cs in c['change_source'] if isinstance(cs, PBChangeSource)]) < 1:
c['change_source'].append(PBChangeSource())
c['db_url'] = "sqlite:///state.sqlite"
c['mergeRequests'] = buildbotcustom.misc.mergeRequests
-# Give the release builders priority over other builders
-def prioritizeBuilders(botmaster, builders):
- def sortkey(builder):
- builds = builder.getBuildable()
- if builds:
- # The builder that gets sorted first, gets run first, but the build
- # request priorities are in ascending order (higher priority gets
- # run next), so flip the sign of the priority so that higher
- # priorities sort to the front
- req_priority = -builds[0].priority
- submitted_at = builds[0].submittedAt
- else:
- req_priority = 0
- submitted_at = None
-
- if builder.builder_status.category == 'release':
- priority = 0
- else:
- priority = 1
-
- return priority, req_priority, submitted_at
- builders.sort(key=sortkey)
- return builders
-c['prioritizeBuilders'] = prioritizeBuilders
-
# c is shorthand for BuildmasterConfig, so make sure they still refer to the
# same thing
assert c is BuildmasterConfig
--- a/thunderbird/macosx/tryserver/nightly/mozconfig
+++ b/thunderbird/macosx/tryserver/nightly/mozconfig
@@ -1,27 +1,13 @@
# mozconfig.common only exists in mozilla-central
if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig.common" || test -e "$topsrcdir/build/macosx/universal/mozconfig.common"; then
- # Now in comm-central land.
- if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig.common"; then
- # We need some hackery to deal with the mozilla/ build system calling this
- # mozconfig.
- oldtopsrcdir=$topsrcdir
- export topsrcdir=$topsrcdir/mozilla
- fi
-
- mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
- . $topsrcdir/build/macosx/universal/mozconfig.common
export MOZ_PKG_VERSION=mac
- if test -n $oldtopsrcdir; then
- export topsrcdir=$oldtopsrcdir
- fi
-
# No specific options needed here.
else
# Treat this as a 1.9.2 mozconfig.
if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
. $topsrcdir/mozilla/build/macosx/universal/mozconfig
else
--- a/thunderbird/release_master.py
+++ b/thunderbird/release_master.py
@@ -108,31 +108,31 @@ gloConfig = {
'packageTests' : False,
'unittestMasters' : (),
# 'Version' numbers we are updating _TO_
'majorUpdateRepoPath' : 'releases/mozilla-1.9.2',
'majorUpdateSourceRepoPath' : 'releases/comm-1.9.2',
'majorUpdateToVersion' : '3.1.7',
#'majorUpdateAppVersion' : majorUpdateToVersion,
- 'majorUpdateBuildNumber' : 2,
+ 'majorUpdateBuildNumber' : 3,
'majorUpdateBaseTag' : 'THUNDERBIRD_3_1_7',
'majorUpdateReleaseNotesUrl' : 'http://www.mozillamessaging.com/%locale%/thunderbird/3.1/details/index.html',
'majorUpdatePatcherConfig' : 'moz192-thunderbird-branch-major-update-patcher2.cfg',
'majorUpdateVerifyConfigs' : {'linux': 'moz191-thunderbird-linux-major.cfg',
'macosx': 'moz191-thunderbird-mac-major.cfg',
'win32': 'moz191-thunderbird-win32-major.cfg'},
},
'31': {
'hgUsername' : 'tbirdbld',
'hgSshKey' : '~cltbld/.ssh/tbirdbld_dsa',
'relbranchPrefix' : 'COMM',
'sourceRepoName' : 'comm-1.9.2', # buildbot branch name
'sourceRepoPath' : 'releases/comm-1.9.2',
- 'sourceRepoRevision' : '6e84a6eb7dad',
+ 'sourceRepoRevision' : 'f85a2c5971a3',
# 'If' blank, automation will create its own branch based on COMM_<date>_RELBRANCH
'relbranchOverride' : 'COMM19213_20101129_RELBRANCH',
'mozillaRepoPath' : 'releases/mozilla-1.9.2',
'mozillaRepoRevision' : '0c159bd1d600',
# 'If' blank, automation will create its own branch based on COMM_<date>_RELBRANCH
# 'You' typically want to set this to the gecko relbranch if doing a release off
# 'a' specific gecko version.
'mozillaRelbranchOverride' : 'GECKO19213_20101122_RELBRANCH', # put Gecko relbranch here that we base upon
@@ -163,17 +163,17 @@ gloConfig = {
# 'appVersion' and oldAppVersion are optional definitions used in places that
# 'don''t care about what we call it. Eg, when version bumping we will bump to
# 'appVersion', not version.
'version' : '3.1.7',
#'appVersion' : version,
#XXX: 'Not' entirely certain if/where this is used.
# 'Derived' from mozillaRelbranchOverride. eg: COMM19211_20101004_RELBRANCH == 1.9.2.11
'milestone' : '1.9.2.13',
- 'buildNumber' : 2,
+ 'buildNumber' : 3,
'baseTag' : 'THUNDERBIRD_3_1_7',
# 'The' old version is the revision from which we should generate update snippets.
'oldVersion' : '3.1.6',
#'oldAppVersion' : oldVersion,
'oldBuildNumber' : 1,
'oldBaseTag' : 'THUNDERBIRD_3_1_6',
'enUSPlatforms' : ('linux', 'win32', 'macosx'),
'unittestPlatforms' : (),