--- a/configs/single_locale/mozilla-aurora_android-api-11.py
+++ b/configs/single_locale/mozilla-aurora_android-api-11.py
@@ -2,22 +2,16 @@ BRANCH = "mozilla-aurora"
MOZ_UPDATE_CHANNEL = "aurora"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-l10n"
EN_US_BINARY_URL = "http://stage.mozilla.org/pub/mozilla.org/mobile/nightly/latest-%s-android-api-11/en-US" % (BRANCH)
#STAGE_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
STAGE_SERVER = "stage.mozilla.org"
STAGE_USER = "ffxbld"
STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
-#AUS_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
-AUS_SERVER = "aus3-staging.mozilla.org"
-AUS_USER = "ffxbld"
-AUS_SSH_KEY = "~/.ssh/ffxbld_rsa"
-AUS_UPLOAD_BASE_DIR = "/opt/aus2/incoming/2/Fennec"
-AUS_BASE_DIR = BRANCH + "/%(build_target)s/%(buildid)s/%(locale)s"
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"buildbot_json_path": "buildprops.json",
"purge_minsize": 10,
@@ -77,23 +71,18 @@ config = {
"UPLOAD_TO_TEMP": "1",
},
"merge_locales": True,
"make_dirs": ['config'],
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-11/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
- # AUS
+ # Balrog
"build_target": "Android_arm-eabi-gcc3",
- "aus_server": AUS_SERVER,
- "aus_user": AUS_USER,
- "aus_ssh_key": AUS_SSH_KEY,
- "aus_upload_base_dir": AUS_UPLOAD_BASE_DIR,
- "aus_base_dir": AUS_BASE_DIR,
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
'alsa-lib-devel', 'libcurl-devel',
'wireless-tools-devel', 'libX11-devel',--- a/configs/single_locale/mozilla-aurora_android-api-9.py
+++ b/configs/single_locale/mozilla-aurora_android-api-9.py
@@ -2,22 +2,16 @@ BRANCH = "mozilla-aurora"
MOZ_UPDATE_CHANNEL = "aurora"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-l10n"
EN_US_BINARY_URL = "http://stage.mozilla.org/pub/mozilla.org/mobile/nightly/latest-%s-android-api-9/en-US" % (BRANCH)
#STAGE_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
STAGE_SERVER = "stage.mozilla.org"
STAGE_USER = "ffxbld"
STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
-#AUS_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
-AUS_SERVER = "aus3-staging.mozilla.org"
-AUS_USER = "ffxbld"
-AUS_SSH_KEY = "~/.ssh/ffxbld_rsa"
-AUS_UPLOAD_BASE_DIR = "/opt/aus2/incoming/2/Fennec"
-AUS_BASE_DIR = BRANCH + "/%(build_target)s/%(buildid)s/%(locale)s"
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"buildbot_json_path": "buildprops.json",
"purge_minsize": 10,
@@ -77,23 +71,18 @@ config = {
"UPLOAD_TO_TEMP": "1",
},
"merge_locales": True,
"make_dirs": ['config'],
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
- # AUS
+ # Balrog
"build_target": "Android_arm-eabi-gcc3",
- "aus_server": AUS_SERVER,
- "aus_user": AUS_USER,
- "aus_ssh_key": AUS_SSH_KEY,
- "aus_upload_base_dir": AUS_UPLOAD_BASE_DIR,
- "aus_base_dir": AUS_BASE_DIR,
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
'alsa-lib-devel', 'libcurl-devel',
'wireless-tools-devel', 'libX11-devel',--- a/configs/single_locale/mozilla-aurora_android.py
+++ b/configs/single_locale/mozilla-aurora_android.py
@@ -2,37 +2,31 @@ BRANCH = "mozilla-aurora"
MOZ_UPDATE_CHANNEL = "aurora"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-l10n"
EN_US_BINARY_URL = "http://stage.mozilla.org/pub/mozilla.org/mobile/nightly/latest-%s-android/en-US" % (BRANCH)
#STAGE_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
STAGE_SERVER = "stage.mozilla.org"
STAGE_USER = "ffxbld"
STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
-#AUS_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
-AUS_SERVER = "aus3-staging.mozilla.org"
-AUS_USER = "ffxbld"
-AUS_SSH_KEY = "~/.ssh/ffxbld_rsa"
-AUS_UPLOAD_BASE_DIR = "/opt/aus2/incoming/2/Fennec"
-AUS_BASE_DIR = BRANCH + "/%(build_target)s/%(buildid)s/%(locale)s"
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"buildbot_json_path": "buildprops.json",
"purge_minsize": 10,
"force_clobber": True,
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
"locales_file": "%s/mobile/android/locales/all-locales" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
- 'balrog_credentials_file': 'oauth.txt',
+ 'balrog_credentials_file': 'oauth.txt',
"tools_repo": "https://hg.mozilla.org/build/tools",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
@@ -77,23 +71,18 @@ config = {
"UPLOAD_TO_TEMP": "1",
},
"merge_locales": True,
"make_dirs": ['config'],
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
- # AUS
+ # Balrog
"build_target": "Android_arm-eabi-gcc3",
- "aus_server": AUS_SERVER,
- "aus_user": AUS_USER,
- "aus_ssh_key": AUS_SSH_KEY,
- "aus_upload_base_dir": AUS_UPLOAD_BASE_DIR,
- "aus_base_dir": AUS_BASE_DIR,
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
'alsa-lib-devel', 'libcurl-devel',
'wireless-tools-devel', 'libX11-devel',--- a/configs/single_locale/mozilla-central_android-api-11.py
+++ b/configs/single_locale/mozilla-central_android-api-11.py
@@ -2,37 +2,31 @@ BRANCH = "mozilla-central"
MOZ_UPDATE_CHANNEL = "nightly"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-l10n"
EN_US_BINARY_URL = "http://stage.mozilla.org/pub/mozilla.org/mobile/nightly/latest-%s-android-api-11/en-US" % (BRANCH)
#STAGE_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
STAGE_SERVER = "stage.mozilla.org"
STAGE_USER = "ffxbld"
STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
-#AUS_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
-AUS_SERVER = "aus3-staging.mozilla.org"
-AUS_USER = "ffxbld"
-AUS_SSH_KEY = "~/.ssh/ffxbld_rsa"
-AUS_UPLOAD_BASE_DIR = "/opt/aus2/incoming/2/Fennec"
-AUS_BASE_DIR = BRANCH + "/%(build_target)s/%(buildid)s/%(locale)s"
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"buildbot_json_path": "buildprops.json",
"purge_minsize": 10,
"force_clobber": True,
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
"locales_file": "%s/mobile/android/locales/all-locales" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
- 'balrog_credentials_file': 'oauth.txt',
+ 'balrog_credentials_file': 'oauth.txt',
"tools_repo": "https://hg.mozilla.org/build/tools",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
@@ -77,23 +71,18 @@ config = {
"UPLOAD_TO_TEMP": "1",
},
"merge_locales": True,
"make_dirs": ['config'],
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-11/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
- # AUS
+ # Balrog
"build_target": "Android_arm-eabi-gcc3",
- "aus_server": AUS_SERVER,
- "aus_user": AUS_USER,
- "aus_ssh_key": AUS_SSH_KEY,
- "aus_upload_base_dir": AUS_UPLOAD_BASE_DIR,
- "aus_base_dir": AUS_BASE_DIR,
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
'alsa-lib-devel', 'libcurl-devel',
'wireless-tools-devel', 'libX11-devel',--- a/configs/single_locale/mozilla-central_android-api-9.py
+++ b/configs/single_locale/mozilla-central_android-api-9.py
@@ -2,37 +2,31 @@ BRANCH = "mozilla-central"
MOZ_UPDATE_CHANNEL = "nightly"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-l10n"
EN_US_BINARY_URL = "http://stage.mozilla.org/pub/mozilla.org/mobile/nightly/latest-%s-android-api-9/en-US" % (BRANCH)
#STAGE_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
STAGE_SERVER = "stage.mozilla.org"
STAGE_USER = "ffxbld"
STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
-#AUS_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
-AUS_SERVER = "aus3-staging.mozilla.org"
-AUS_USER = "ffxbld"
-AUS_SSH_KEY = "~/.ssh/ffxbld_rsa"
-AUS_UPLOAD_BASE_DIR = "/opt/aus2/incoming/2/Fennec"
-AUS_BASE_DIR = BRANCH + "/%(build_target)s/%(buildid)s/%(locale)s"
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"buildbot_json_path": "buildprops.json",
"purge_minsize": 10,
"force_clobber": True,
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
"locales_file": "%s/mobile/android/locales/all-locales" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
- 'balrog_credentials_file': 'oauth.txt',
+ 'balrog_credentials_file': 'oauth.txt',
"tools_repo": "https://hg.mozilla.org/build/tools",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
@@ -77,23 +71,18 @@ config = {
"UPLOAD_TO_TEMP": "1",
},
"merge_locales": True,
"make_dirs": ['config'],
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
- # AUS
+ # Balrog
"build_target": "Android_arm-eabi-gcc3",
- "aus_server": AUS_SERVER,
- "aus_user": AUS_USER,
- "aus_ssh_key": AUS_SSH_KEY,
- "aus_upload_base_dir": AUS_UPLOAD_BASE_DIR,
- "aus_base_dir": AUS_BASE_DIR,
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
'alsa-lib-devel', 'libcurl-devel',
'wireless-tools-devel', 'libX11-devel',--- a/configs/single_locale/mozilla-central_android.py
+++ b/configs/single_locale/mozilla-central_android.py
@@ -2,37 +2,31 @@ BRANCH = "mozilla-central"
MOZ_UPDATE_CHANNEL = "nightly"
MOZILLA_DIR = BRANCH
OBJDIR = "obj-l10n"
EN_US_BINARY_URL = "http://stage.mozilla.org/pub/mozilla.org/mobile/nightly/latest-%s-android/en-US" % (BRANCH)
#STAGE_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
STAGE_SERVER = "stage.mozilla.org"
STAGE_USER = "ffxbld"
STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
-#AUS_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
-AUS_SERVER = "aus3-staging.mozilla.org"
-AUS_USER = "ffxbld"
-AUS_SSH_KEY = "~/.ssh/ffxbld_rsa"
-AUS_UPLOAD_BASE_DIR = "/opt/aus2/incoming/2/Fennec"
-AUS_BASE_DIR = BRANCH + "/%(build_target)s/%(buildid)s/%(locale)s"
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"buildbot_json_path": "buildprops.json",
"purge_minsize": 10,
"force_clobber": True,
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
"locales_file": "%s/mobile/android/locales/all-locales" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
- 'balrog_credentials_file': 'oauth.txt',
+ 'balrog_credentials_file': 'oauth.txt',
"tools_repo": "https://hg.mozilla.org/build/tools",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
@@ -77,23 +71,18 @@ config = {
"UPLOAD_TO_TEMP": "1",
},
"merge_locales": True,
"make_dirs": ['config'],
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
- # AUS
+ # Balrog
"build_target": "Android_arm-eabi-gcc3",
- "aus_server": AUS_SERVER,
- "aus_user": AUS_USER,
- "aus_ssh_key": AUS_SSH_KEY,
- "aus_upload_base_dir": AUS_UPLOAD_BASE_DIR,
- "aus_base_dir": AUS_BASE_DIR,
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
'alsa-lib-devel', 'libcurl-devel',
'wireless-tools-devel', 'libX11-devel',--- a/mozharness/mozilla/release.py
+++ b/mozharness/mozilla/release.py
@@ -35,19 +35,15 @@ class ReleaseMixin():
self.fatal("Release config file %s not found!" % c["release_config_file"])
except RuntimeError:
self.fatal("Invalid release config file %s!" % c["release_config_file"])
self.release_config['version'] = rc['version']
self.release_config['buildnum'] = rc['buildNumber']
self.release_config['ftp_server'] = rc['stagingServer']
self.release_config['ftp_user'] = c.get('ftp_user', rc['hgUsername'])
self.release_config['ftp_ssh_key'] = c.get('ftp_ssh_key', rc['hgSshKey'])
- self.release_config['aus_server'] = rc['ausHost']
- self.release_config['aus_user'] = rc['ausUser']
- self.release_config['aus_ssh_key'] = c.get('aus_ssh_key', '~/.ssh/%s' % rc['ausSshKey'])
else:
self.info("No release config file; using default config.")
for key in ('version', 'buildnum',
- 'ftp_server', 'ftp_user', 'ftp_ssh_key',
- 'aus_server', 'aus_user', 'aus_ssh_key',):
+ 'ftp_server', 'ftp_user', 'ftp_ssh_key'):
self.release_config[key] = c[key]
self.info("Release config:\n%s" % self.release_config)
return self.release_config--- a/mozharness/mozilla/signing.py
+++ b/mozharness/mozilla/signing.py
@@ -25,103 +25,21 @@ AndroidSignatureVerificationErrorList =
"substr": "ERROR: Could not unzip",
"level": ERROR,
}, {
"regex": re.compile(r'''Are you sure this is a (nightly|release) package'''),
"level": FATAL,
"explanation": "Not signed!"
}]
-# TODO I'm not sure how many templates we will need.
-# This will be sufficient for the moment.
-SNIPPET_TEMPLATE = """version=1
-type=complete
-url=%(url)s
-hashFunction=sha512
-hashValue=%(sha512_hash)s
-size=%(size)d
-build=%(buildid)s
-appv=%(version)s
-extv=%(version)s
-"""
-
-UPDATE_XML_TEMPLATE = """<?xml version="1.0"?>
-<updates>
- <update type="minor" displayVersion="%(version)s" appVersion="%(version)s" platformVersion="%(version)s" buildID="%(buildid)s"%(extra_update_attrs)s>
- <patch type="complete" URL="%(url)s?build_id=%(buildid)s&version=%(version)s" hashFunction="SHA512" hashValue="%(sha512_hash)s" size="%(size)d"/>
- </update>
-</updates>
-"""
-
# SigningMixin {{{1
class SigningMixin(BaseSigningMixin):
- """Generic signing helper methods.
- """
- def create_complete_snippet(self, binary_path, version, buildid,
- url, snippet_dir, snippet_file="complete.txt",
- size=None, sha512_hash=None,
- extra_update_attrs='',
- snippet_template=SNIPPET_TEMPLATE,
- error_level=ERROR):
- """Creates a complete snippet, and writes to file.
- Returns True for success, False for failure.
- """
- self.info("Creating complete snippet for %s." % binary_path)
- if not os.path.exists(binary_path):
- self.error("Can't create complete snippet: %s doesn't exist!" % binary_path)
- return False
- replace_dict = {
- 'version': version,
- 'buildid': buildid,
- 'url': url,
- }
- # Allow these to be generated beforehand since we may be generating
- # many snippets for the same binary_path, and calculating them
- # multiple times isn't efficient.
- if size:
- replace_dict['size'] = size
- else:
- replace_dict['size'] = self.query_filesize(binary_path)
- if sha512_hash:
- replace_dict['sha512_hash'] = sha512_hash
- else:
- replace_dict['sha512_hash'] = self.query_sha512sum(binary_path)
- if extra_update_attrs:
- replace_dict['extra_update_attrs'] = ' %s' % extra_update_attrs
- else:
- replace_dict['extra_update_attrs'] = ''
- contents = snippet_template % replace_dict
- self.mkdir_p(snippet_dir)
- snippet_path = os.path.join(snippet_dir, snippet_file)
- if self.write_to_file(snippet_path, contents) is None:
- self.log("Unable to write complete snippet to %s!" % snippet_path,
- level=error_level)
- return False
- else:
- return True
-
- def create_update_xml(self, binary_path, version, buildid,
- url, snippet_dir, snippet_file="update.xml",
- extra_update_attrs='',
- size=None, sha512_hash=None,
- snippet_template=UPDATE_XML_TEMPLATE,
- error_level=ERROR):
- """Creates a complete update.xml, and writes to file.
- Returns True for success, False for failure.
- """
- return self.create_complete_snippet(
- binary_path=binary_path, version=version, buildid=buildid,
- url=url, snippet_dir=snippet_dir, snippet_file=snippet_file,
- size=size, sha512_hash=sha512_hash,
- extra_update_attrs=extra_update_attrs,
- snippet_template=snippet_template, error_level=error_level
- )
-
+ """Generic signing helper methods."""
def query_moz_sign_cmd(self, formats='gpg'):
if 'MOZ_SIGNING_SERVERS' not in os.environ:
self.fatal("MOZ_SIGNING_SERVERS not in env; no MOZ_SIGN_CMD for you!")
dirs = self.query_abs_dirs()
signing_dir = os.path.join(dirs['abs_work_dir'], 'tools', 'release', 'signing')
cache_dir = os.path.join(dirs['abs_work_dir'], 'signing_cache')
token = os.path.join(dirs['base_work_dir'], 'token')
nonce = os.path.join(dirs['base_work_dir'], 'nonce')--- a/scripts/mobile_l10n.py
+++ b/scripts/mobile_l10n.py
@@ -110,18 +110,16 @@ class MobileSingleLocale(MockMixin, Loca
config_options=self.config_options,
all_actions=[
"clobber",
"pull",
"list-locales",
"setup",
"repack",
"upload-repacks",
- "create-nightly-snippets",
- "upload-nightly-snippets",
"submit-to-balrog",
"summary",
],
require_config_file=require_config_file
)
self.base_package_name = None
self.buildid = None
self.make_ident_output = None
@@ -256,20 +254,18 @@ class MobileSingleLocale(MockMixin, Loca
self.version = rc['version']
else:
self.version = self._query_make_variable("MOZ_APP_VERSION")
return self.version
def query_upload_url(self, locale):
if locale in self.upload_urls:
return self.upload_urls[locale]
- if 'snippet_base_url' in self.config:
- return self.config['snippet_base_url'] % {'locale': locale}
- self.error("Can't determine the upload url for %s!" % locale)
- self.error("You either need to run --upload-repacks before --create-nightly-snippets, or specify the 'snippet_base_url' in self.config!")
+ else:
+ self.error("Can't determine the upload url for %s!" % locale)
def query_abs_dirs(self):
if self.abs_dirs:
return self.abs_dirs
abs_dirs = super(MobileSingleLocale, self).query_abs_dirs()
dirs = {
'abs_tools_dir':
@@ -486,62 +482,16 @@ class MobileSingleLocale(MockMixin, Loca
if not success:
self.add_failure(locale, message="Failed to detect %s url in make upload!" % (locale))
print output
continue
success_count += 1
self.summarize_success_count(success_count, total_count,
message="Uploaded %d of %d binaries successfully.")
- def create_nightly_snippets(self):
- c = self.config
- dirs = self.query_abs_dirs()
- locales = self.query_locales()
- base_package_name = self.query_base_package_name()
- buildid = self.query_buildid()
- version = self.query_version()
- binary_dir = os.path.join(dirs['abs_objdir'], 'dist')
- success_count = total_count = 0
- replace_dict = {
- 'buildid': buildid,
- 'build_target': c['build_target'],
- }
- for locale in locales:
- total_count += 1
- replace_dict['locale'] = locale
- aus_base_dir = c['aus_base_dir'] % replace_dict
- aus_abs_dir = os.path.join(dirs['abs_work_dir'], 'update',
- aus_base_dir)
- binary_path = os.path.join(binary_dir,
- base_package_name % {'locale': locale})
- url = self.query_upload_url(locale)
- if not url:
- self.add_failure(locale, "Can't create a snippet for %s without an upload url." % locale)
- continue
- if not self.create_complete_snippet(binary_path, version, buildid, url, aus_abs_dir):
- self.add_failure(locale, message="Errors creating snippet for %s! Removing snippet directory." % locale)
- self.rmtree(aus_abs_dir)
- continue
- self.run_command_m(["touch", os.path.join(aus_abs_dir, "partial.txt")])
- success_count += 1
- self.summarize_success_count(success_count, total_count,
- message="Created %d of %d snippets successfully.")
-
- def upload_nightly_snippets(self):
- c = self.config
- dirs = self.query_abs_dirs()
- update_dir = os.path.join(dirs['abs_work_dir'], 'update')
- if not os.path.exists(update_dir):
- self.error("No such directory %s! Skipping..." % update_dir)
- return
- if self.rsync_upload_directory(update_dir, c['aus_ssh_key'],
- c['aus_user'], c['aus_server'],
- c['aus_upload_base_dir']):
- self.return_code += 1
-
def checkout_tools(self):
dirs = self.query_abs_dirs()
# We need hg.m.o/build/tools checked out
self.info("Checking out tools")
repos = [{
'repo': self.config['tools_repo'],
'vcs': "hg", # May not have hgtool yet
@@ -557,64 +507,64 @@ class MobileSingleLocale(MockMixin, Loca
r = r"(\.)" + re.escape(locale) + r"(\.*)"
apks = []
for f in os.listdir(apkdir):
if f.endswith(".apk") and re.search(r, f):
apks.append(f)
if len(apks) == 0:
self.fatal("Found no apks files in %s, don't know what to do:\n%s" % (apkdir, apks), exit_code=1)
-
+
return os.path.join(apkdir, apks[0])
-
+
def query_is_release(self):
-
+
return bool(self.config.get("is_release"))
-
- def submit_to_balrog(self):
-
+
+ def submit_to_balrog(self):
+
if not self.query_is_nightly() and not self.query_is_release():
self.info("Not a nightly or release build, skipping balrog submission.")
return
if not self.config.get("balrog_api_root"):
self.info("balrog_api_root not set; skipping balrog submission.")
return
self.checkout_tools()
-
+
dirs = self.query_abs_dirs()
locales = self.query_locales()
for locale in locales:
apkfile = self.query_apkfile_path(locale)
apk_url = self.query_upload_url(locale)
# Set other necessary properties for Balrog submission. None need to
# be passed back to buildbot, so we won't write them to the properties
#files.
self.set_buildbot_property("locale", locale)
-
+
self.set_buildbot_property("appVersion", self.query_version())
# The Balrog submitter translates this platform into a build target
# via https://github.com/mozilla/build-tools/blob/master/lib/python/release/platforms.py#L23
self.set_buildbot_property("platform", self.buildbot_config["properties"]["platform"])
#TODO: Is there a better way to get this?
self.set_buildbot_property("appName", "Fennec")
# TODO: don't hardcode
self.set_buildbot_property("hashType", "sha512")
self.set_buildbot_property("completeMarSize", self.query_filesize(apkfile))
self.set_buildbot_property("completeMarHash", self.query_sha512sum(apkfile))
self.set_buildbot_property("completeMarUrl", apk_url)
self.set_buildbot_property("isOSUpdate", False)
self.set_buildbot_property("buildid", self.query_buildid())
- if self.query_is_nightly():
+ if self.query_is_nightly():
self.submit_balrog_updates(release_type="nightly")
else:
- self.submit_balrog_updates(release_type="release")
+ self.submit_balrog_updates(release_type="release")
if not self.query_is_nightly():
self.submit_balrog_release_pusher(dirs)
-
+
# main {{{1
if __name__ == '__main__':
single_locale = MobileSingleLocale()
single_locale.run_and_exit()