bug 739770 - mobile beta off aurora configs. r=bhearsum
authorAki Sasaki <asasaki@mozilla.com>
Wed, 04 Apr 2012 11:00:34 -0700
changeset 5732 91c9718574857804e785015b2c2a7704923a5756
parent 5731 9a2ec1acc49625f482ef44899541f84fbf322ec7
child 5733 c393d6d725ba349bd41217818554e33ee966caf3
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersbhearsum
bugs739770
bug 739770 - mobile beta off aurora configs. r=bhearsum
l10n-changesets_mobile-aurora.json
mozilla/release-fennec-mozilla-aurora.py
mozilla/release-fennec-mozilla-beta.py
mozilla/release-fennec-mozilla-release.py
mozilla/staging_release-fennec-mozilla-aurora.py
mozilla/staging_release-fennec-mozilla-beta.py
mozilla/staging_release-fennec-mozilla-release.py
copy from mozilla/l10n-changesets_mobile-beta.json
copy to l10n-changesets_mobile-aurora.json
copy from mozilla/release-fennec-mozilla-beta.py
copy to mozilla/release-fennec-mozilla-aurora.py
--- a/mozilla/release-fennec-mozilla-beta.py
+++ b/mozilla/release-fennec-mozilla-aurora.py
@@ -21,23 +21,23 @@ releaseConfig['milestone']           = r
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FENNEC_12_0b4'
 #  Old version info
 releaseConfig['oldVersion']          = '12.0b3'
 releaseConfig['oldAppVersion']       = '12.0'
 releaseConfig['oldBuildNumber']      = 1
 releaseConfig['oldBaseTag']          = 'FENNEC_12_0b3'
 #  Next (nightly) version info
-releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
-releaseConfig['nextMilestone']       = releaseConfig['milestone']
+releaseConfig['nextAppVersion']      = '13.0a2'
+releaseConfig['nextMilestone']       = '13.0a2'
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
     'mobile': {
-        'name': 'mozilla-beta',
-        'path': 'releases/mozilla-beta',
+        'name': 'mozilla-aurora',
+        'path': 'releases/mozilla-aurora',
         'revision': 'e4ed83ba6eb9',
         'relbranch': None,
         'bumpFiles': {
             'mobile/android/confvars.sh': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
             'mobile/xul/confvars.sh': {
@@ -56,36 +56,36 @@ releaseConfig['sourceRepositories']  = {
                 'version': releaseConfig['milestone'],
                 'nextVersion': releaseConfig['nextMilestone']
             },
         }
     }
 }
 #  L10n repositories
 releaseConfig['l10nRelbranch']       = None
-releaseConfig['l10nRepoPath']        = 'releases/l10n/mozilla-beta'
-releaseConfig['l10nRevisionFile']    = 'l10n-changesets_mobile-beta.json'
+releaseConfig['l10nRepoPath']        = 'releases/l10n/mozilla-aurora'
+releaseConfig['l10nRevisionFile']    = 'l10n-changesets_mobile-aurora.json'
 releaseConfig['l10nJsonFile']        = releaseConfig['l10nRevisionFile']
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'build/compare-locales': 'RELEASE_AUTOMATION',
     'build/buildbot': 'production-0.8',
     'build/mozharness': 'default',
 }
 
 # Platform configuration
-releaseConfig['enUSPlatforms']        = ('android-xul',)
-releaseConfig['notifyPlatforms']      = ('android-xul',)
+releaseConfig['enUSPlatforms']        = ('android-xul', 'android')
+releaseConfig['notifyPlatforms']      = releaseConfig['enUSPlatforms']
 releaseConfig['signedPlatforms']      = releaseConfig['enUSPlatforms']
 releaseConfig['unittestPlatforms']    = ()
 releaseConfig['talosTestPlatforms']   = ()
 releaseConfig['enableUnittests']      = True
 
 # L10n configuration
-releaseConfig['l10nPlatforms']       = ()
+releaseConfig['l10nPlatforms']       = ('android',)
 releaseConfig['l10nChunks']          = 6
 releaseConfig['mergeLocales']        = True
 releaseConfig['enableMultiLocale']   = True
 
 # Mercurial account
 releaseConfig['hgUsername']          = 'ffxbld'
 releaseConfig['hgSshKey']            = '~cltbld/.ssh/ffxbld_dsa'
 
@@ -116,22 +116,28 @@ releaseConfig['enable_repo_setup']      
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disableL10nVerification']  = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
 releaseConfig['disablePushToMirrors']     = True
 
+releaseConfig['single_locale_options'] = {
+    'android': [
+        '--cfg',
+        'single_locale/release_mozilla-aurora_android.py',
+        '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
+    ],
+}
+
 releaseConfig['multilocale_config'] = {
     'platforms': {
-        'android':
-            'multi_locale/release_mozilla-beta_android.json',
         'android-xul':
-            'multi_locale/release_mozilla-beta_android-xul.json',
+            'multi_locale/release_mozilla-aurora_android-xul.json',
     },
     'multilocaleOptions': [
         '--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
         '--only-pull-locale-source',
         '--only-add-locales',
         '--only-package-multi',
     ]
 }
--- a/mozilla/release-fennec-mozilla-beta.py
+++ b/mozilla/release-fennec-mozilla-beta.py
@@ -116,20 +116,26 @@ releaseConfig['enable_repo_setup']      
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disableL10nVerification']  = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
 releaseConfig['disablePushToMirrors']     = True
 
+releaseConfig['single_locale_options'] = {
+    'android': [
+        '--cfg',
+        'single_locale/release_mozilla-beta_android.py',
+        '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
+    ],
+}
+
 releaseConfig['multilocale_config'] = {
     'platforms': {
-        'android':
-            'multi_locale/release_mozilla-beta_android.json',
         'android-xul':
             'multi_locale/release_mozilla-beta_android-xul.json',
     },
     'multilocaleOptions': [
         '--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
         '--only-pull-locale-source',
         '--only-add-locales',
         '--only-package-multi',
--- a/mozilla/release-fennec-mozilla-release.py
+++ b/mozilla/release-fennec-mozilla-release.py
@@ -126,16 +126,24 @@ releaseConfig['enable_repo_setup']      
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disableL10nVerification']  = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
 releaseConfig['disablePushToMirrors']     = True
 
+releaseConfig['single_locale_options'] = {
+    'android': [
+        '--cfg',
+        'single_locale/release_mozilla-release_android.py',
+        '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
+    ],
+}
+
 releaseConfig['multilocale_config'] = {
     'platforms': {
         'android-xul':
             'multi_locale/release_mozilla-release_android-xul.json',
     },
     'multilocaleOptions': [
         '--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
         '--only-pull-locale-source',
copy from mozilla/staging_release-fennec-mozilla-beta.py
copy to mozilla/staging_release-fennec-mozilla-aurora.py
--- a/mozilla/staging_release-fennec-mozilla-beta.py
+++ b/mozilla/staging_release-fennec-mozilla-aurora.py
@@ -21,24 +21,24 @@ releaseConfig['milestone']           = r
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FENNEC_12_0b3'
 #  Old version info
 releaseConfig['oldVersion']          = '12.0b2'
 releaseConfig['oldAppVersion']       = '12.0'
 releaseConfig['oldBuildNumber']      = 1
 releaseConfig['oldBaseTag']          = 'FENNEC_12_0b2'
 #  Next (nightly) version info
-releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
-releaseConfig['nextMilestone']       = releaseConfig['milestone']
+releaseConfig['nextAppVersion']      = '13.0a2'
+releaseConfig['nextMilestone']       = '13.0a2'
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
     'mobile': {
-        'name': 'mozilla-beta',
-        'clonePath': 'releases/mozilla-beta',
-        'path': 'users/stage-ffxbld/mozilla-beta',
+        'name': 'mozilla-aurora',
+        'clonePath': 'releases/mozilla-aurora',
+        'path': 'users/stage-ffxbld/mozilla-aurora',
         'revision': 'default',
         'relbranch': None,
         'bumpFiles': {
             'mobile/android/confvars.sh': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
             'mobile/xul/confvars.sh': {
@@ -57,38 +57,38 @@ releaseConfig['sourceRepositories']  = {
                 'version': releaseConfig['milestone'],
                 'nextVersion': releaseConfig['nextMilestone']
             },
         }
     }
 }
 #  L10n repositories
 releaseConfig['l10nRelbranch']       = None
-releaseConfig['l10nRepoClonePath']   = 'releases/l10n/mozilla-beta'
+releaseConfig['l10nRepoClonePath']   = 'releases/l10n/mozilla-aurora'
 releaseConfig['l10nRepoPath']        = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile']    = 'l10n-changesets_mobile-beta.json'
+releaseConfig['l10nRevisionFile']    = 'l10n-changesets_mobile-aurora.json'
 releaseConfig['l10nJsonFile'] = releaseConfig['l10nRevisionFile']
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
     'users/stage-ffxbld/buildbot': 'production-0.8',
     'users/stage-ffxbld/partner-repacks': 'default',
     'users/stage-ffxbld/mozharness': 'default',
 }
 
 # Platform configuration
-releaseConfig['enUSPlatforms']        = ('android-xul',)
-releaseConfig['notifyPlatforms']      = ('android-xul',)
+releaseConfig['enUSPlatforms']        = ('android-xul', 'android')
+releaseConfig['notifyPlatforms']      = releaseConfig['enUSPlatforms']
 releaseConfig['signedPlatforms']      = releaseConfig['enUSPlatforms']
 releaseConfig['unittestPlatforms']    = ()
 releaseConfig['talosTestPlatforms']   = ()
 releaseConfig['enableUnittests']      = True
 
 # L10n configuration
-releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
+releaseConfig['l10nPlatforms']       = ('android',)
 releaseConfig['l10nChunks']          = 2
 releaseConfig['mergeLocales']        = True
 releaseConfig['enableMultiLocale']   = True
 
 # Mercurial account
 releaseConfig['hgUsername']          = 'stage-ffxbld'
 releaseConfig['hgSshKey']            = '~cltbld/.ssh/ffxbld_dsa'
 
@@ -119,22 +119,29 @@ releaseConfig['enable_repo_setup']      
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disableL10nVerification']  = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
 releaseConfig['disablePushToMirrors']     = True
 
+releaseConfig['single_locale_options'] = {
+    'android': [
+        '--cfg',
+        'single_locale/staging_release_mozilla-aurora_android.py',
+        '--user-repo-override', 'users/stage-ffxbld',
+        '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
+    ],
+}
+
 releaseConfig['multilocale_config'] = {
     'platforms': {
-        'android':
-            'multi_locale/staging_release_mozilla-beta_android.json',
         'android-xul':
-            'multi_locale/staging_release_mozilla-beta_android-xul.json',
+            'multi_locale/staging_release_mozilla-aurora_android-xul.json',
     },
     'multilocaleOptions': [
         '--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
         '--user-repo-override=users/stage-ffxbld',
         '--only-pull-locale-source',
         '--only-add-locales',
         '--only-package-multi',
     ]
--- a/mozilla/staging_release-fennec-mozilla-beta.py
+++ b/mozilla/staging_release-fennec-mozilla-beta.py
@@ -78,17 +78,17 @@ releaseConfig['otherReposToTag']     = {
 releaseConfig['enUSPlatforms']        = ('android-xul',)
 releaseConfig['notifyPlatforms']      = ('android-xul',)
 releaseConfig['signedPlatforms']      = releaseConfig['enUSPlatforms']
 releaseConfig['unittestPlatforms']    = ()
 releaseConfig['talosTestPlatforms']   = ()
 releaseConfig['enableUnittests']      = True
 
 # L10n configuration
-releaseConfig['l10nPlatforms']       = releaseConfig['enUSPlatforms']
+releaseConfig['l10nPlatforms']       = ()
 releaseConfig['l10nChunks']          = 2
 releaseConfig['mergeLocales']        = True
 releaseConfig['enableMultiLocale']   = True
 
 # Mercurial account
 releaseConfig['hgUsername']          = 'stage-ffxbld'
 releaseConfig['hgSshKey']            = '~cltbld/.ssh/ffxbld_dsa'
 
@@ -119,20 +119,27 @@ releaseConfig['enable_repo_setup']      
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disableL10nVerification']  = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
 releaseConfig['disablePushToMirrors']     = True
 
+releaseConfig['single_locale_options'] = {
+    'android': [
+        '--cfg',
+        'single_locale/staging_release_mozilla-beta_android.py',
+        '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
+        '--user-repo-override', 'users/stage-ffxbld',
+    ],
+}
+
 releaseConfig['multilocale_config'] = {
     'platforms': {
-        'android':
-            'multi_locale/staging_release_mozilla-beta_android.json',
         'android-xul':
             'multi_locale/staging_release_mozilla-beta_android-xul.json',
     },
     'multilocaleOptions': [
         '--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
         '--user-repo-override=users/stage-ffxbld',
         '--only-pull-locale-source',
         '--only-add-locales',
--- a/mozilla/staging_release-fennec-mozilla-release.py
+++ b/mozilla/staging_release-fennec-mozilla-release.py
@@ -127,16 +127,25 @@ releaseConfig['enable_repo_setup']      
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disableL10nVerification']  = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
 releaseConfig['disablePushToMirrors']     = True
 
+releaseConfig['single_locale_options'] = {
+    'android': [
+        '--cfg',
+        'single_locale/staging_release_mozilla-release_android.py',
+        '--user-repo-override', 'users/stage-ffxbld',
+        '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
+    ],
+}
+
 releaseConfig['multilocale_config'] = {
     'platforms': {
         'android-xul':
             'multi_locale/staging_release_mozilla-release_android-xul.json',
     },
     'multilocaleOptions': [
         '--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
         '--user-repo-override=users/stage-ffxbld',