debsign + release config changes for 1.1rc1. bug 566428, r=jhford
authorAki Sasaki <asasaki@mozilla.com>
Thu, 20 May 2010 15:06:19 -0700
changeset 2426 bcf52c44b955de476cfbf55630f435485552b059
parent 2425 39a29c975dfae60b662c72f92cb7cfb65e1d1db6
child 2427 4a7d5b3e90ed98d40dcd9292517d4b166bc5d1d3
push id1878
push userasasaki@mozilla.com
push dateThu, 20 May 2010 22:06:28 +0000
reviewersjhford
bugs566428
debsign + release config changes for 1.1rc1. bug 566428, r=jhford
debsign/config-production.py
debsign/config-staging.py
mozilla2-staging/release-fennec-1.1.py
mozilla2-staging/release_mobile_master.py
mozilla2/release-fennec-1.1.py
mozilla2/release_mobile_master.py
--- a/debsign/config-production.py
+++ b/debsign/config-production.py
@@ -17,17 +17,17 @@ REAL_RELEASE_ENV = {
     'STAGE_DIR': '/pub/mozilla.org/mobile/repos',
     'SSH_KEY': '/home/cltbld/.ssh/ffxbld_dsa',
 }
 CANDIDATES_RELEASE_ENV = {
     'STAGE_USERNAME': 'ffxbld',
     'STAGE_SERVER': 'stage.mozilla.org',
     'BASE_STAGE_PATH': '/home/ftp',
     'BASE_STAGE_URL': 'http://ftp.mozilla.org',
-    'STAGE_DIR': '/pub/mozilla.org/mobile/candidates/1.1b1-candidates/repos',
+    'STAGE_DIR': '/pub/mozilla.org/mobile/candidates/1.1rc1-candidates/repos',
     'SSH_KEY': '/home/cltbld/.ssh/ffxbld_dsa',
 }
  
 
 # Change for real release
 RELEASE_ENV = CANDIDATES_RELEASE_ENV
 
 DEBSIGN_CONFIG = {}
@@ -50,26 +50,26 @@ DEBSIGN_CONFIG['branches']['trunk']['ena
 DEBSIGN_CONFIG['branches']['1.9.2']['nightly']['base_stage_path'] = '/home/ftp'
 DEBSIGN_CONFIG['branches']['1.9.2']['nightly']['base_stage_url'] = 'http://ftp.mozilla.org'
 DEBSIGN_CONFIG['branches']['1.9.2']['nightly']['stage_dir'] = '/pub/mozilla.org/mobile/nightly/latest-mobile-1.9.2'
 DEBSIGN_CONFIG['branches']['1.9.2']['nightly']['env'] = NIGHTLY_ENV
 DEBSIGN_CONFIG['branches']['1.9.2']['nightly']['extra_debs_list'] = None
 DEBSIGN_CONFIG['branches']['1.9.2']['enable_release'] = True
 DEBSIGN_CONFIG['branches']['1.9.2']['release']['base_stage_path'] = '/home/ftp'
 DEBSIGN_CONFIG['branches']['1.9.2']['release']['base_stage_url'] = 'http://ftp.mozilla.org'
-DEBSIGN_CONFIG['branches']['1.9.2']['release']['stage_dir'] = '/pub/mozilla.org/mobile/candidates/1.1b1-candidates/build2/maemo'
+DEBSIGN_CONFIG['branches']['1.9.2']['release']['stage_dir'] = '/pub/mozilla.org/mobile/candidates/1.1rc1-candidates/build1/maemo4'
 DEBSIGN_CONFIG['branches']['1.9.2']['release']['env'] = RELEASE_ENV
 DEBSIGN_CONFIG['branches']['1.9.2']['release']['extra_debs_list'] = []
 
 #
 # Trigger config
 #
 
 TRIGGER_CONFIG['sendchange_master'] = "production-mobile-master.build.mozilla.org:9011"
 TRIGGER_CONFIG['branches'] = {
     'trunk': {},
     '1.9.2': {},
 }
 TRIGGER_CONFIG['branches']['trunk']['env'] = NIGHTLY_ENV
 TRIGGER_CONFIG['branches']['1.9.2']['env'] = NIGHTLY_ENV
-TRIGGER_CONFIG['branches']['1.9.2']['release_mobile_tag'] = 'FENNEC_1_1b1_RELEASE'
-TRIGGER_CONFIG['mobile_repo'] = 'http://hg.mozilla.org/mobile-browser'
+TRIGGER_CONFIG['branches']['1.9.2']['release_mobile_tag'] = 'FENNEC_1_1rc1_RELEASE'
+TRIGGER_CONFIG['mobile_repo'] = 'http://hg.mozilla.org/releases/mobile-1.1'
 TRIGGER_CONFIG['locales_file'] = 'mobile/locales/all-locales'
--- a/debsign/config-staging.py
+++ b/debsign/config-staging.py
@@ -62,26 +62,26 @@ DEBSIGN_CONFIG['branches']['trunk']['ena
 DEBSIGN_CONFIG['branches']['1.9.2']['nightly']['base_stage_path'] = '/home/ftp'
 DEBSIGN_CONFIG['branches']['1.9.2']['nightly']['base_stage_url'] = 'http://ftp.mozilla.org'
 DEBSIGN_CONFIG['branches']['1.9.2']['nightly']['stage_dir'] = '/pub/mozilla.org/mobile/nightly/latest-mobile-1.9.2'
 DEBSIGN_CONFIG['branches']['1.9.2']['nightly']['env'] = NIGHTLY_ENV
 DEBSIGN_CONFIG['branches']['1.9.2']['nightly']['extra_debs_list'] = None
 DEBSIGN_CONFIG['branches']['1.9.2']['enable_release'] = True
 DEBSIGN_CONFIG['branches']['trunk']['release']['base_stage_path'] = '/var/www/html'
 DEBSIGN_CONFIG['branches']['1.9.2']['release']['base_stage_url'] = 'http://staging-mobile-master.build.mozilla.org'
-DEBSIGN_CONFIG['branches']['1.9.2']['release']['stage_dir'] = '/candidates/1.0.1rc1-candidates/build1/maemo'
+DEBSIGN_CONFIG['branches']['1.9.2']['release']['stage_dir'] = '/candidates/1.1rc1-candidates/build1/maemo4'
 DEBSIGN_CONFIG['branches']['1.9.2']['release']['env'] = RELEASE_ENV
-DEBSIGN_CONFIG['branches']['1.9.2']['release']['extra_debs_list'] = ['http://staging-stage.build.mozilla.org/pub/mozilla.org/mobile/candidates/1.0.1rc1-candidates/build1/maemo/multi/xulrunner_1.9.2.1+rc1_armel.deb']
+DEBSIGN_CONFIG['branches']['1.9.2']['release']['extra_debs_list'] = None
 
 #
 # Trigger config
 #
 
 TRIGGER_CONFIG['sendchange_master'] = "staging-mobile-master.build.mozilla.org:9011"
 TRIGGER_CONFIG['branches'] = {
     'trunk': {},
     '1.9.2': {},
 }
 TRIGGER_CONFIG['branches']['trunk']['env'] = NIGHTLY_TRIGGER_ENV
 TRIGGER_CONFIG['branches']['1.9.2']['env'] = NIGHTLY_TRIGGER_ENV
-TRIGGER_CONFIG['branches']['1.9.2']['release_mobile_tag'] = 'FENNEC_1_0rc2_RELEASE'
-TRIGGER_CONFIG['mobile_repo'] = 'http://hg.mozilla.org/mobile-browser'
+TRIGGER_CONFIG['branches']['1.9.2']['release_mobile_tag'] = 'default'
+TRIGGER_CONFIG['mobile_repo'] = 'http://hg.mozilla.org/releases/mobile-1.1'
 TRIGGER_CONFIG['locales_file'] = 'mobile/locales/all-locales'
--- a/mozilla2-staging/release-fennec-1.1.py
+++ b/mozilla2-staging/release-fennec-1.1.py
@@ -2,40 +2,40 @@ hgUsername          = 'stage-ffxbld'
 hgSshKey            = '~cltbld/.ssh/ffxbld_dsa'
 mobileBranchNick    = 'mobile-1.9.2'
 mozSourceRepoName      = 'mozilla-1.9.2'
 # This parameter (and its l10n equivalent) is for staging only and necessary
 # because the repo_setup builder needs to know where to clone repositories from.
 # It is not used for anything else.
 mozSourceRepoClonePath = 'releases/mozilla-1.9.2'
 mozSourceRepoPath      = 'users/stage-ffxbld/mozilla-1.9.2'
-mozSourceRepoRevision  = 'FILLMEIN'
+mozSourceRepoRevision  = 'default'
 mobileSourceRepoName      = 'mobile-1.1'
 mobileSourceRepoClonePath = 'releases/mobile-1.1'
 mobileSourceRepoPath      = 'users/stage-ffxbld/mobile-1.1'
-mobileSourceRepoRevision  = 'FILLMEIN'
+mobileSourceRepoRevision  = 'default'
 mozRelbranchOverride   = ''
 l10nRelbranchOverride   = ''
 mobileRelbranchOverride   = ''
 l10nRepoClonePath   = 'releases/l10n-mozilla-1.9.2'
 l10nRepoPath        = 'users/stage-ffxbld'
 l10nRevisionFile    = 'l10n-changesets_mobile-1.1.json'
 productName         = 'fennec'
 appName             = 'mobile'
 mergeLocales        = True
 # 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             = '1.1b1'
+version             = '1.1rc1'
 appVersion          = '1.1'
-milestone           = '1.9.2.3'
+milestone           = '1.9.2.5'
 buildNumber         = 1
-baseTag             = 'FENNEC_1_1b1'
+baseTag             = 'FENNEC_1_1rc1'
 enUSPlatforms       = ('maemo4',)
 l10nPlatforms       = enUSPlatforms
 enUSDesktopPlatforms = ('linux-i686', 'macosx-i686', 'win32-i686')
 l10nDesktopPlatforms = ()
 talosTestPlatforms  = ()
 ftpServer           = 'staging-stage.build.mozilla.org'
 stagingServer       = 'staging-stage.build.mozilla.org'
 stageBasePath       = '/home/ftp/pub/mobile/candidates'
--- a/mozilla2-staging/release_mobile_master.py
+++ b/mozilla2-staging/release_mobile_master.py
@@ -250,16 +250,17 @@ for platform in enUSPlatforms:
             stageServer=branchConfig['stage_server'],
             stageSshKey=branchConfig['stage_ssh_key'],
             stageBasePath=candidatesPath,
             mobileRepoPath=mobileSourceRepoPath,
             mozRevision='%s_RELEASE' % baseTag,
             mobileRevision='%s_RELEASE' % baseTag,
             l10nTag='%s_RELEASE' % baseTag,
             platform=platform,
+            uploadSymbols=True,
             buildsBeforeReboot=pf['builds_before_reboot'],
             baseWorkDir=releaseWorkDir,
             baseBuildDir=releaseBuildDir,
             baseUploadDir=baseUploadDir,
             buildToolsRepoPath=branchConfig['build_tools_repo_path'],
             clobberURL=branchConfig['base_clobber_url'],
             clobberTime=clobberTime,
             buildSpace=10,
@@ -338,16 +339,17 @@ for platform in enUSDesktopPlatforms:
         stageGroup=branchConfig['stage_group'],
         stageSshKey=branchConfig['stage_ssh_key'],
         stageServer=branchConfig['stage_server'],
         stageBasePath='%s/%s' % (candidatesPath, platform),
         mobileRepoPath=mobileSourceRepoPath,
         mozRevision='%s_RELEASE' % baseTag,
         mobileRevision='%s_RELEASE' % baseTag,
         platform=platform,
+        uploadSymbols=True,
         packageGlobList=packageGlobList,
         baseWorkDir=pf['base_workdir'],
         baseUploadDir=baseUploadDir,
         buildToolsRepoPath=branchConfig['build_tools_repo_path'],
         clobberURL=branchConfig['base_clobber_url'],
         clobberTime=clobberTime,
         buildSpace=10,
         buildsBeforeReboot=pf['builds_before_reboot'],
--- a/mozilla2/release-fennec-1.1.py
+++ b/mozilla2/release-fennec-1.1.py
@@ -1,42 +1,42 @@
 hgUsername          = 'ffxbld'
 hgSshKey            = '~cltbld/.ssh/ffxbld_dsa'
 mobileBranchNick    = 'mobile-1.9.2'
 mozSourceRepoName      = 'mozilla-1.9.2'
 # This parameter (and its l10n equivalent) is for staging only and necessary
 # because the repo_setup builder needs to know where to clone repositories from.
 # It is not used for anything else.
 mozSourceRepoPath      = 'releases/mozilla-1.9.2'
-mozSourceRepoRevision  = '838c05e99a8e'
+mozSourceRepoRevision  = 'FILLMEIN'
 mobileSourceRepoName      = 'mobile-1.1'
 mobileSourceRepoPath      = 'releases/mobile-1.1'
-mobileSourceRepoRevision  = 'ce825c90cf36'
-mozRelbranchOverride      = 'GECKO1925pre_20100414_RELBRANCH'
-l10nRelbranchOverride     = 'GECKO1925pre_20100414_RELBRANCH'
-mobileRelbranchOverride   = 'GECKO1925pre_20100414_RELBRANCH'
+mobileSourceRepoRevision  = 'FILLMEIN'
+mozRelbranchOverride      = ''
+l10nRelbranchOverride     = ''
+mobileRelbranchOverride   = ''
 l10nRepoPath        = 'releases/l10n-mozilla-1.9.2'
 l10nRevisionFile    = 'l10n-changesets_mobile-1.1.json'
 productName         = 'fennec'
 appName             = 'mobile'
 mergeLocales        = True
 # 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             = '1.1b1'
-appVersion          = '1.1b1'
-milestone           = '1.9.2.5pre'
-buildNumber         = 2
-baseTag             = 'FENNEC_1_1b1'
+version             = '1.1rc1'
+appVersion          = '1.1'
+milestone           = '1.9.2.5'
+buildNumber         = 1
+baseTag             = 'FENNEC_1_1rc1'
 enUSPlatforms       = ('maemo4',)
 l10nPlatforms       = enUSPlatforms
 enUSDesktopPlatforms = ('linux-i686', 'macosx-i686', 'win32-i686')
 l10nDesktopPlatforms = ()
 talosTestPlatforms  = ()
 ftpServer           = 'ftp.mozilla.org'
 stagingServer       = 'stage.mozilla.org'
 stageBasePath       = '/home/ftp/pub/mobile/candidates'
 base_enUS_binaryURL = 'http://%s/pub/mozilla.org/mobile/candidates/%s-candidates/build%d' % (ftpServer, version, buildNumber)
-doPartnerRepacks    = False
+doPartnerRepacks    = True
 partnersRepoPath    = 'build/partner-repacks'
 partnerRepackPlatforms = ('maemo4',)
--- a/mozilla2/release_mobile_master.py
+++ b/mozilla2/release_mobile_master.py
@@ -207,16 +207,17 @@ for platform in enUSPlatforms:
             stageServer=branchConfig['stage_server'],
             stageSshKey=branchConfig['stage_ssh_key'],
             stageBasePath=candidatesPath,
             mobileRepoPath=mobileSourceRepoPath,
             mozRevision='%s_RELEASE' % baseTag,
             mobileRevision='%s_RELEASE' % baseTag,
             l10nTag='%s_RELEASE' % baseTag,
             platform=platform,
+            uploadSymbols=True,
             buildsBeforeReboot=pf['builds_before_reboot'],
             baseWorkDir=releaseWorkDir,
             baseBuildDir=releaseBuildDir,
             baseUploadDir=baseUploadDir,
             buildToolsRepoPath=branchConfig['build_tools_repo_path'],
             clobberURL=branchConfig['base_clobber_url'],
             clobberTime=clobberTime,
             buildSpace=10,
@@ -303,16 +304,17 @@ for platform in enUSDesktopPlatforms:
         stageGroup=branchConfig['stage_group'],
         stageSshKey=branchConfig['stage_ssh_key'],
         stageServer=branchConfig['stage_server'],
         stageBasePath='%s/%s' % (candidatesPath, platform),
         mobileRepoPath=mobileSourceRepoPath,
         mozRevision='%s_RELEASE' % baseTag,
         mobileRevision='%s_RELEASE' % baseTag,
         platform=platform,
+        uploadSymbols=True,
         packageGlobList=packageGlobList,
         baseWorkDir=pf['base_workdir'],
         baseUploadDir=baseUploadDir,
         buildToolsRepoPath=branchConfig['build_tools_repo_path'],
         clobberURL=branchConfig['base_clobber_url'],
         clobberTime=clobberTime,
         buildSpace=10,
         buildsBeforeReboot=pf['builds_before_reboot'],