bug 697611: release_sanity.py should check in-tree mozconfigs if they…

… exist. r=lsblakk
mozilla · Feb 1, 2012 · f76ab63 · f76ab63
1 parent 6bec009
commit f76ab63
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/buildbot-helpers/release_sanity.py b/buildbot-helpers/release_sanity.py
@@ -96,7 +96,7 @@ def verify_repo(branch, revision, hghost):
         error_tally.add('verify_repo')
     return success
 
-def verify_mozconfigs(branch, version, hghost, product, platforms, whitelist=None):
+def verify_mozconfigs(branch, revision, hghost, product, mozconfigs, appName, whitelist=None):
     """Compare nightly mozconfigs for branch to release mozconfigs and compare to whitelist of known differences"""
     if whitelist:
         mozconfigWhitelist = readConfig(whitelist, ['whitelist'])
@@ -105,14 +105,14 @@ def verify_mozconfigs(branch, version, hghost, product, platforms, whitelist=Non
     log.info("Comparing %s mozconfigs to nightly mozconfigs..." % product)
     success = True
     types = {'+': 'release', '-': 'nightly'}
-    tag = ''.join([product.upper(), "_",  version.replace('.','_'), "_RELEASE"])
+    for platform,mozconfig in mozconfigs.items():
-    for platform in platforms:
         urls = []
         mozconfigs = []
-        for type in types.values():
+        # Create links to the two mozconfigs.
-            urls.append(make_hg_url(hghost, 'build/buildbot-configs', 'http', 
+        releaseConfig = make_hg_url(hghost, branch, 'http', revision, mozconfig)
-                                tag, os.path.join('mozilla2', platform, 
+        urls.append(releaseConfig)
-                                branch, type,'mozconfig')))
+        # The nightly one is the exact same URL, with the file part changed.
+        urls.append(releaseConfig.rstrip('release') + 'nightly')
         for url in urls:
             try:
                 mozconfigs.append(urllib2.urlopen(url).readlines())
@@ -362,11 +362,12 @@ def verify_options(cmd_options, config):
 
             # verify that mozconfigs for this release pass diff with nightly, compared to a whitelist
             if not verify_mozconfigs(
-                    options.branch,
+                    releaseConfig['sourceRepositories']['mozilla']['path'],
-                    options.version,
+                    releaseConfig['sourceRepositories']['mozilla']['revision'],
                     branchConfig['hghost'],
                     releaseConfig['productName'],
-                    releaseConfig['enUSPlatforms'],
+                    releaseConfig['mozconfigs'],
+                    releaseConfig['appName'],
                     options.whitelist
                 ):
                 test_success = False