Permalink
Browse files

Merge from default -> production-0.8

changeset:   2587:425b5f09395c
parent:      2585:ad06bd5973ce
user:        Rail Aliiev <rail@mozilla.com>
date:        Tue Sep 11 14:50:23 2012 -0400
summary:     Bug 788883 - Release automation should announce signed android builds. r=catlee

changeset:   2588:6997e7c4a85d
tag:         tip
user:        Justin Wood <Callek@gmail.com>
date:        Tue Sep 11 19:37:50 2012 -0400
summary:     Bug 772928 - Enable reftests for armv6 builds on tegras. r=aki

--HG--
branch : production-0.8
  • Loading branch information...
2 parents ee01a26 + 6743af0 commit 2a7d28a450267e7f1b2951ab9e6a50f81f175deb @Callek Callek committed Sep 12, 2012
Showing with 7 additions and 5 deletions.
  1. +6 −4 process/factory.py
  2. +1 −1 process/release.py
View
10 process/factory.py
@@ -5004,7 +5004,7 @@ def get_robocop_url(build):
# name. (The suite name must include 'robocop', as that data
# driven feature is used to append the robocop options to a
# command line.)
- if self.platform == "android" and 'robocop' in self.suites[0]['suite']:
+ if "android" in self.platform and 'robocop' in self.suites[0]['suite']:
self.addStep(DownloadFile(
url_fn=get_robocop_url,
filename_property='robocop_filename',
@@ -5409,7 +5409,7 @@ def addUnpackBuildSteps(self):
command=[WithProperties('%(filename)s'), WithProperties('/INI=%(workdir_pwd)s\\firefoxInstallConfig.ini')],
env=self.env)
)
- elif self.OS in ('tegra_android',):
+ elif self.OS in ('tegra_android','tegra_android-armv6'):
self.addStep(UnpackFile(
filename=WithProperties("../%(filename)s"),
workdir="%s/%s" % (self.workdirBase, self.productName),
@@ -5447,7 +5447,7 @@ def addUnpackBuildSteps(self):
property_name="exepath",
value="../%s/%s" % (self.productName, self.productName)
))
- elif self.OS in ('tegra_android',):
+ elif self.OS in ('tegra_android','tegra_android-armv6'):
self.addStep(SetBuildProperty(
property_name="exepath",
value="../%s/%s" % (self.productName, self.productName)
@@ -5641,7 +5641,9 @@ def addSetupSteps(self):
def addPluginInstallSteps(self):
if self.plugins:
#32 bit (includes mac browsers)
- if self.OS in ('xp', 'vista', 'win7', 'fedora', 'tegra_android', 'leopard', 'snowleopard', 'leopard-o', 'lion', 'mountainlion'):
+ if self.OS in ('xp', 'vista', 'win7', 'fedora', 'tegra_android', \
+ 'tegra_android-armv6', 'leopard', 'snowleopard', \
+ 'leopard-o', 'lion', 'mountainlion'):
self.addStep(DownloadFile(
url=WithProperties("%s/%s" % (self.supportUrlBase, self.plugins['32'])),
workdir=os.path.join(self.workdirBase, "talos/base_profile"),
View
2 process/release.py
@@ -1746,7 +1746,7 @@ def hasPlatformSubstring(platforms, substring):
changeIsImportant=lambda c: \
changeContainsProduct(c, releaseConfig['productName'])
))
- for recipient in releaseConfig['AllRecipients']:
+ for recipient in releaseConfig['ImportantRecipients']:
if hasPlatformSubstring(releaseConfig['enUSPlatforms'], 'android'):
#send a message when android signing is complete
status.append(ChangeNotifier(

0 comments on commit 2a7d28a

Please sign in to comment.