Bug 1290477 - Stop sanitize against milestones in elmo for releases r=Callek old-release-runner
authorRail Aliiev <rail@mozilla.com>
Thu, 11 Aug 2016 10:26:41 -0400
branchold-release-runner
changeset 6951 b6eca0165947f202cef8f98d9880503e25b8ddc0
parent 6839 2caef2b63d0e5c82daa2d19fd961d1fce1aa8a01
child 7360 172a81d0d5abad9f9bdf5858dd4dd8052637532b
push id5185
push userraliiev@mozilla.com
push dateThu, 11 Aug 2016 14:51:17 +0000
reviewersCallek
bugs1290477
Bug 1290477 - Stop sanitize against milestones in elmo for releases r=Callek MozReview-Commit-ID: HnXDUGIGIRu
buildbot-helpers/release_sanity.py
buildfarm/release/release-runner.py
--- a/buildbot-helpers/release_sanity.py
+++ b/buildbot-helpers/release_sanity.py
@@ -152,60 +152,16 @@ def verify_l10n_changesets(hgHost, l10n_
         success = retry(get_l10n_changesets,
                         kwargs=dict(locale_url=locale_url), attempts=3,
                         sleeptime=1, retry_exceptions=(urllib2.HTTPError, urllib2.URLError))
         if not success:
             error_tally.add('verify_l10n')
     return success
 
 
-def verify_l10n_dashboard(l10n_changesets, l10n_dashboard_version=None):
-    """Checks the l10n-changesets against the l10n dashboard"""
-    success = True
-    locales = query_locale_revisions(l10n_changesets)
-    if l10n_dashboard_version:
-        l10n_dashboard_version = getL10nDashboardVersion(
-            l10n_dashboard_version, releaseConfig['productName'],
-            parse_version=False)
-    else:
-        l10n_dashboard_version = getL10nDashboardVersion(
-            releaseConfig['version'], releaseConfig['productName'])
-    dash_url = 'https://l10n.mozilla.org/shipping/l10n-changesets?ms=%s' % \
-        l10n_dashboard_version
-    log.info("Comparing l10n changesets on dashboard %s to on-disk %s ..."
-             % (dash_url, l10n_changesets))
-    try:
-        dash_changesets = {}
-        for line in urllib2.urlopen(dash_url, timeout=10):
-            locale, revision = line.split()
-            dash_changesets[locale] = revision
-        for locale in locales:
-            revision = locales[locale]
-            dash_revision = dash_changesets.pop(locale, None)
-            if not dash_revision:
-                log.error("\tlocale %s missing on dashboard" % locale)
-                success = False
-                error_tally.add('verify_l10n_dashboard')
-            elif revision != dash_revision:
-                log.error("\tlocale %s revisions not matching: %s (config)"
-                          " vs. %s (dashboard)"
-                          % (locale, revision, dash_revision))
-                success = False
-                error_tally.add('verify_l10n_dashboard')
-        for locale in dash_changesets:
-            log.error("\tlocale %s missing in config" % locale)
-            success = False
-            error_tally.add('verify_l10n_dashboard')
-    except (urllib2.HTTPError, urllib2.URLError):
-        log.error("cannot find l10n dashboard at %s" % dash_url)
-        success = False
-        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)
     log.info("Comparing l10n changesets to shipped locales ...")
     diff_list = locale_diff(locales, shipped_locales)
     if len(diff_list) > 0:
@@ -293,19 +249,16 @@ if __name__ == '__main__':
     )
     parser.add_option(
         "-b", "--bypass-check", dest="check", action="store_false",
         help="don't bother verifying release repo's on this master")
     parser.add_option(
         "-l", "--bypass-l10n-check", dest="checkL10n", action="store_false",
         help="don't bother verifying l10n milestones")
     parser.add_option(
-        "--bypass-l10n-dashboard-check", dest="checkL10nDashboard",
-        action="store_false", help="don't verify l10n changesets against the dashboard (implied when --bypass-l10n-check is passed)")
-    parser.add_option(
         "-m", "--bypass-mozconfig-check", dest="checkMozconfigs",
         action="store_false", help="don't verify mozconfigs")
     parser.add_option(
         "-d", "--dryrun", "--dry-run", dest="dryrun", action="store_true",
         help="just do the reconfig/checks, without starting anything")
     parser.add_option(
         "-u", "--username", dest="username",
         help="specify a specific username to attach to the sendchange")
@@ -460,24 +413,16 @@ if __name__ == '__main__':
 
             if options.checkL10n:
                 # verify that l10n changesets exist
                 if not verify_l10n_changesets(branchConfig['hghost'],
                                               l10nRevisionFile):
                     test_success = False
                     log.error("Error verifying l10n changesets")
 
-                if options.checkL10nDashboard:
-                    # verify that l10n changesets match the dashboard
-                    if not verify_l10n_dashboard(
-                        l10nRevisionFile,
-                            options.l10n_dashboard_version):
-                        test_success = False
-                        log.error("Error verifying l10n dashboard changesets")
-
                 if options.checkMultiLocale:
                     if releaseConfig.get('enableMultiLocale'):
                         f = open(l10nRevisionFile)
                         if 'multilocale' not in f.read():
                             test_success = False
                             log.error("MultiLocale enabled but not present in l10n changesets")
                         f.close()
 
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -229,18 +229,16 @@ def get_release_sanity_args(configs_work
         '--version', release['version'],
         '--build-number', str(release['buildNumber']),
         '--release-config', cfgFile,
         '--skip-verify-configs',
         '--masters-json-file', masters_json,
         '--configs-dir', configs_workdir,
         '--configs-branch', buildbot_configs_branch,
     ]
-    if not release['dashboardCheck']:
-        args.append('--bypass-l10n-dashboard-check')
     return args
 
 
 def sendMailRD(smtpServer, From, cfgFile, r):
     # Send an email to the mailing after the build
     contentMail = ""
     release_config = readReleaseConfig(cfgFile)
     sources = release_config['sourceRepositories']