copy from seamonkey/l10n-changesets
copy to thunderbird/l10n-changesets
--- a/seamonkey/l10n-changesets
+++ b/thunderbird/l10n-changesets
@@ -1,16 +1,1 @@
-be f4a613903d99
-ca 957f10409b47
-de 606b1fdbc746
-es-AR af153883ca11
-es-ES e869e588cb2d
-fr 65f5a606902e
-gl 3942d7d1c7b7
-hu 9964ab5b5d1f
-lt 3b66fe3b2b30
-nb-NO 099877e60fb1
-nl 8e90aba5a31f
-pl 3b0b181eb6a6
-pt-PT 4d9e082f83d3
-ru 4f9ffc11a8c2
-sk ecbc3f0d2d4c
-tr 3df2ad94dd15
+
--- a/thunderbird/master.cfg
+++ b/thunderbird/master.cfg
@@ -35,18 +35,16 @@ from buildbot.scheduler import Scheduler
from buildbot.status.tinderbox import TinderboxMailNotifier
from buildbot.status.words import IRC
import buildbot.steps.source
reload(buildbot.steps.source)
from buildbot.steps.source import Mercurial
from buildbot.steps.shell import Compile, ShellCommand, WithProperties, TreeSize
-from buildbot.changes.pb import PBChangeSource
-
import buildbotcustom.changes.hgpoller
import buildbotcustom.steps.misc
import buildbotcustom.steps.test
import buildbotcustom.steps.transfer
import buildbotcustom.steps.updates
import buildbotcustom.status.tinderbox
reload(buildbotcustom.changes.hgpoller)
reload(buildbotcustom.steps.misc)
@@ -90,23 +88,30 @@ c['status'] = []
buildbotcustom.log.init(
scheduler = buildbotcustom.log.DEBUG,
dispatcher = buildbotcustom.log.DEBUG
)
s = SchedulerL10n("l10n", "l10nbuilds.ini")
c['schedulers'].append(s)
+####### Release Automation
+
+import release_master
+reload(release_master)
+
+c['builders'].extend(release_master.builders)
+c['schedulers'].extend(release_master.schedulers)
+c['change_source'].extend(release_master.change_source)
+c['status'].extend(release_master.status)
+
####### SOURCES
c['change_source'] = []
-from buildbot.changes.pb import PBChangeSource
-c['change_source'].append(PBChangeSource())
-
setupHGPollersFromBranches(DEFAULTS, BRANCHES, c['change_source'], 'comm-central')
for name in BRANCHES.keys():
# shorthand
branch = BRANCHES[name]
build_factory = getConfig(DEFAULTS, branch, 'factory')
master_branch = getConfig(DEFAULTS, branch, 'master_branch')
mozilla_branch = getConfig(DEFAULTS, branch, 'mozilla_central_branch')
copy from seamonkey/release_config.py
copy to thunderbird/release_config.py
--- a/seamonkey/release_config.py
+++ b/thunderbird/release_config.py
@@ -1,52 +1,52 @@
-hgUsername = 'seabld'
-hgSshKey = '~seabld/.ssh/seabld_dsa'
+hgUsername = 'tbirdbld'
+hgSshKey = '~cltbld/.ssh/tbirdbld_dsa'
relbranchPrefix = 'COMM'
sourceRepoName = 'comm-1.9.1' # buildbot branch name
sourceRepoPath = 'comm-central'
-sourceRepoRevision = '34ba282bf549'
+sourceRepoRevision = ''
relbranchOverride = ''
mozillaRepoPath = 'releases/mozilla-1.9.1'
-mozillaRepoRevision = 'ac59325cf0a9'
+mozillaRepoRevision = ''
#mozillaRelbranchOverride = 'GECKO1913_20090824_RELBRANCH' # put Gecko relbranch here that we base upon
mozillaRelbranchOverride = ''
inspectorRepoPath = 'dom-inspector' # leave empty if inspector is not to be tagged
-inspectorRepoRevision = 'ca35d7b7c443'
+inspectorRepoRevision = ''
inspectorRelbranchOverride = ''
venkmanRepoPath = 'venkman' # leave empty if venkman is not to be tagged
-venkmanRepoRevision = '10ee9dce95c6'
+venkmanRepoRevision = ''
venkmanRelbranchOverride = ''
-chatzillaCVSRoot = ':ext:seabld@cvs.mozilla.org:/cvsroot'
-chatzillaTimestamp = '2009-09-03 00:00' # leave empty if chatzilla is not to be tagged
+chatzillaCVSRoot = ''
+chatzillaTimestamp = '' # leave empty if chatzilla is not to be tagged
l10nRepoPath = 'releases/l10n-mozilla-1.9.1'
l10nRevisionFile = 'l10n-changesets'
toolsRepoPath = 'build/tools'
-cvsroot = ':ext:seabld@cvs.mozilla.org:/cvsroot' # for patcher, etc.
-productVersionFile = 'suite/config/version-191.txt'
-productName = 'seamonkey'
-brandName = 'SeaMonkey'
-appName = 'suite'
+cvsroot = ':ext:cltbld@cvs.mozilla.org:/cvsroot' # for patcher, etc.
+productVersionFile = 'mail/config/version-191.txt'
+productName = 'thunderbird'
+brandName = 'Thunderbird'
+appName = 'mail'
# 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
# appVersion, not version.
-version = '2.0b2'
+version = '3.0b4'
appVersion = version
milestone = '1.9.1.3'
buildNumber = 1
-baseTag = 'SEAMONKEY_2_0b2'
-oldVersion = '2.0b1'
+baseTag = 'THUNDERBIRD_3_0b4'
+oldVersion = '3.0b3'
oldAppVersion = oldVersion
oldBuildNumber = 1
-oldBaseTag = 'SEAMONKEY_2_0b1'
+oldBaseTag = 'THUNDERBIRD_3_0b3'
releasePlatforms = ('linux', 'win32', 'macosx')
-patcherConfig = 'moz191-seamonkey-branch-patcher2.cfg'
+patcherConfig = 'moz191-thunderbird-branch-patcher2.cfg'
patcherToolsTag = 'UPDATE_PACKAGING_R9'
ftpServer = 'ftp.mozilla.org'
stagingServer = 'stage-old.mozilla.org'
bouncerServer = 'download.mozilla.org'
-ausServerUrl = 'https://aus2-community.mozilla.org'
+ausServerUrl = 'https://aus2.mozillamessaging.com'
useBetaChannel = 0
-verifyConfigs = {'linux': 'moz191-seamonkey-linux.cfg',
- 'macosx': 'moz191-seamonkey-mac.cfg',
- 'win32': 'moz191-seamonkey-win32.cfg'}
+verifyConfigs = {'linux': 'moz191-thunderbird-linux.cfg',
+ 'macosx': 'moz191-thunderbird-mac.cfg',
+ 'win32': 'moz191-thunderbird-win32.cfg'}
copy from seamonkey/release_master.py
copy to thunderbird/release_master.py
--- a/seamonkey/release_master.py
+++ b/thunderbird/release_master.py
@@ -156,17 +156,17 @@ tag_factory = CCReleaseTaggingFactory(
cvsroot=chatzillaCVSRoot
)
builders.append({
'name': 'tag',
'slavenames': nightly_config.BRANCHES[sourceRepoName]['platforms']['linux']['slaves'],
'category': 'release',
'builddir': 'tag',
- 'factory': dummy_factory #tag_factory
+ 'factory': tag_factory
})
source_factory = CCSourceFactory(
hgHost=nightly_config.HGHOST,
buildToolsRepoPath=toolsRepoPath, # nightly_config.BUILD_TOOLS_REPO_PATH,
repoPath=sourceRepoPath,
productName=productName,
@@ -183,17 +183,17 @@ source_factory = CCSourceFactory(
autoconfDirs=['.', 'mozilla', 'mozilla/js/src']
)
builders.append({
'name': 'source',
'slavenames': nightly_config.BRANCHES[sourceRepoName]['platforms']['linux']['slaves'],
'category': 'release',
'builddir': 'source',
- 'factory': dummy_factory #source_factory
+ 'factory': source_factory
})
for platform in releasePlatforms:
# shorthand
pf = nightly_config.BRANCHES[sourceRepoName]['platforms'][platform]
mozconfig = '%s/%s/release' % (platform, sourceRepoName)
@@ -230,17 +230,17 @@ for platform in releasePlatforms:
buildNumber=buildNumber
)
builders.append({
'name': '%s_build' % platform,
'slavenames': pf['slaves'],
'category': 'release',
'builddir': '%s_build' % platform,
- 'factory': dummy_factory #build_factory
+ 'factory': build_factory
})
repack_factory = CCReleaseRepackFactory(
hgHost=nightly_config.HGHOST,
project=productName,
appName=appName,
brandName=brandName,
repoPath=sourceRepoPath,