Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert 92346382b571 (Bug 690785) for busted sanity check in 8.0b6 build2

  • Loading branch information...
commit e0d9eb0415ce10171408b9197c2768805dc9a8b1 1 parent 10e8adc
@nthomas-mozilla nthomas-mozilla authored
View
41 buildbot-helpers/release_sanity.py
@@ -27,8 +27,6 @@
from util.hg import make_hg_url
from release.info import readReleaseConfig, getRepoMatchingBranch, readConfig
from release.versions import getL10nDashboardVersion
-from release.l10n import getShippedLocales
-from release.platforms import getLocaleListFromShippedLocales
import logging
from subprocess import CalledProcessError
log = logging.getLogger(__name__)
@@ -55,12 +53,6 @@ def check_buildbot():
print "FAIL: buildbot command doesn't work"
raise
-def locale_diff(locales1,locales2):
- """ accepts two lists and diffs them both ways, returns any differences found """
- diff_list = [locale for locale in locales1 if not locale in locales2]
- diff_list.extend(locale for locale in locales2 if not locale in locales1)
- return diff_list
-
def sendchange(branch, revision, username, master, products):
"""Send the change to buildbot to kick off the release automation"""
cmd = [
@@ -97,7 +89,6 @@ def verify_repo(branch, revision, hghost):
return success
def verify_mozconfigs(branch, version, hghost, product, platforms, whitelist=None):
- """Compare nightly mozconfigs for branch to release mozconfigs and compare to whitelist of known differences"""
if whitelist:
mozconfigWhitelist = readConfig(whitelist, ['whitelist'])
else:
@@ -266,17 +257,6 @@ def verify_l10n_dashboard(l10n_changesets):
error_tally.add('verify_l10n_dashboard')
return success
-def verify_l10n_shipped_locales(l10n_changesets, shipped_locales):
- """Ensure that our l10n-changesets on the master match the repo's shipped locales list"""
- success = True
- locales = query_locale_revisions(l10n_changesets)
- diff_list = locale_diff(locales, shipped_locales)
- if len(diff_list) > 0:
- log.error("l10n_changesets and shipped_locales differ on locales: %s" % diff_list)
- success = False
- error_tally.add('verify_l10n_shipped_locales')
- return success
-
def verify_options(cmd_options, config):
"""Check release_configs against command-line opts"""
success = True
@@ -394,27 +374,6 @@ def verify_options(cmd_options, config):
test_success = False
log.error("Error verifying l10n dashboard changesets")
- #verify that l10n changesets match the shipped locales in firefox product
- if releaseConfig.get('shippedLocalesPath'):
- for sr in releaseConfig['sourceRepositories'].values():
- sourceRepoPath = sr.get('clonePath', sr['path'])
- shippedLocales = getLocaleListFromShippedLocales(
- getShippedLocales(
- releaseConfig['productName'],
- releaseConfig['appName'],
- releaseConfig['version'],
- releaseConfig['buildNumber'],
- sourceRepoPath
- ))
- # l10n_changesets do not have an entry for en-US
- if 'en-US' in shippedLocales:
- shippedLocales.remove('en-US')
- if not verify_l10n_shipped_locales(
- releaseConfig['l10nRevisionFile'],
- shippedLocales):
- test_success = False
- log.error("Error verifying l10n_changesets matches shipped_locales")
-
#verify that the relBranch + revision in the release_configs exists in hg
for sr in releaseConfig['sourceRepositories'].values():
sourceRepoPath = sr.get('clonePath', sr['path'])
View
8 lib/python/release/platforms.py
@@ -65,14 +65,6 @@ def getPlatformLocales(shipped_locales, platforms):
platform_locales[platform].append(locale)
return platform_locales
-def getLocaleListFromShippedLocales(shipped_locales):
- """ return the list of locales in shipped_locales, without platform specific info """
- shipped_locales_list = []
- for line in shipped_locales.splitlines():
- entry = line.strip().split()
- shipped_locales_list.append(entry[0])
- return shipped_locales_list
-
def getPlatformLocalesFromJson(json_file, platforms):
platform_locales = {}
for platform in platforms:
Please sign in to comment.
Something went wrong with that request. Please try again.