Issue 6339 - Don't create encrypted archives on release

releaseAutomation.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import print_function
 
 import os
 import operator
 import re
 import codecs
@@ skipping 175 matching lines @@
         rawMetadata = re.sub(
             r'^(\s*version\s*=\s*).*', r'\g<1>%s' % version,
             rawMetadata, flags=re.I | re.M
         )
 
         fp.seek(0)
         fp.write(rawMetadata)
         fp.truncate()
 
 
-def create_build(platform, base_dir, target_path, version, key_file=None):
+def create_build(platform, base_dir, target_path, version):
     """Create a build for the target platform and version."""
     if platform == 'edge':
         import buildtools.packagerEdge as packager
     else:
         import buildtools.packagerChrome as packager
 
     metadata = readMetadata(base_dir, platform)
     update_metadata(metadata, version)
 
     build_path = os.path.join(
         target_path,
-        getDefaultFileName(metadata, version,
-                           get_extension(platform, key_file is not None))
+        getDefaultFileName(metadata, version, get_extension(platform))
     )
 
     packager.createBuild(base_dir, type=platform, outFile=build_path,
-                         releaseBuild=True, keyFile=key_file)
+                         releaseBuild=True)
 
     return build_path
 
 
 def release_commit(base_dir, extension_name, version, platforms):
     """Create a release commit with a representative message."""
     subprocess.check_output([
         'hg', 'commit', '-R', base_dir, '-m',
         'Noissue - Releasing {} {} for {}'.format(
             extension_name, version,
             ', '.join([p.capitalize() for p in platforms]))],
         stderr=subprocess.STDOUT)
 
 
 def release_tag(base_dir, tag_name, extension_name):
     """Create a tag, along with a commit message for that tag."""
     subprocess.check_call([
         'hg', 'tag', '-R', base_dir, '-f', tag_name,
         '-m', 'Noissue - Adding release tag for {} {}'.format(
             extension_name, tag_name)])
 
 
-def run(baseDir, platforms, version, keyFile, downloads_repo):
+def run(baseDir, platforms, version, downloads_repo):
     if not can_safely_release(baseDir, downloads_repo):
         print('Aborting release.')
         return 1
 
     target_platforms = sorted(platforms)
     release_identifier = '-'.join([version] + [p for p in target_platforms])
 
     release_possible, reason, re_release = release_combination_is_possible(
         version, platforms, baseDir)
 
     if not release_possible:
         logging.error(reason)
         return 2
 
     downloads = []
     # Read extension name from first provided platform
     locale_config = read_locale_config(
         baseDir, target_platforms[0],
         readMetadata(baseDir, target_platforms[0]))
     default_locale_path = os.path.join(locale_config['base_path'],
                                        locale_config['default_locale'],
                                        'messages.json')
     with open(default_locale_path, 'r') as fp:
         extension_name = json.load(fp)['name']['message']
 
     for platform in target_platforms:
-        used_key_file = None
-        if platform == 'chrome':
-            # Currently, only chrome builds are provided by us as signed
-            # packages. Create an unsigned package in base_dir which should be
-            # uploaded to the Chrome Web Store
-            create_build(platform, baseDir, baseDir, version)
-            used_key_file = keyFile
-
         downloads.append(
-            create_build(platform, baseDir, downloads_repo, version,
-                         used_key_file)
+            create_build(platform, baseDir, downloads_repo, version)
         )
 
     # Only create one commit, one tag and one source archive for all
     # platforms
     archive_path = os.path.join(
         downloads_repo,
         'adblockplus-{}-source.tgz'.format(release_identifier),
     )
     create_sourcearchive(baseDir, archive_path)
     downloads.append(archive_path)
     try:
         release_commit(baseDir, extension_name, version, target_platforms)
     except subprocess.CalledProcessError as e:
         if not (re_release and 'nothing changed' in e.output):
             raise
 
     release_tag(baseDir, release_identifier, extension_name)
 
     # Now add the downloads and commit
     subprocess.check_call(['hg', 'add', '-R', downloads_repo] + downloads)
     release_commit(downloads_repo, extension_name, version, target_platforms)
 
     # Push all changes
     subprocess.check_call(['hg', 'push', '-R', baseDir])
     subprocess.check_call(['hg', 'push', '-R', downloads_repo])