bug 1141633: bug 1140437 broke flame kitkat nightlies - use more targeted fix for graphene. r=jlund
authorBen Hearsum <bhearsum@mozilla.com>
Tue, 10 Mar 2015 14:03:22 -0400 (2015-03-10)
changeset 3736 f18e70492ade79e130542cf7d2bf97654b352ad5
parent 3735 cba147db08a51e02b4f2a443c3803c2dda2ea527
child 3738 1638197c5171055746ae7e63730cfca6a9449c30
push id2939
push userbhearsum@mozilla.com
push dateTue, 10 Mar 2015 18:03:30 +0000 (2015-03-10)
reviewersjlund
bugs1141633, 1140437
bug 1141633: bug 1140437 broke flame kitkat nightlies - use more targeted fix for graphene. r=jlund
mozharness/mozilla/updates/balrog.py
--- a/mozharness/mozilla/updates/balrog.py
+++ b/mozharness/mozilla/updates/balrog.py
@@ -29,19 +29,20 @@ class BalrogMixin(object):
         self.set_buildbot_property(
             "hashType", c.get("hash_type", "sha512"), write_to_file=True
         )
 
         balrog_props = dict(properties=dict(chain(
             self.buildbot_config["properties"].items(),
             self.buildbot_properties.items(),
         )))
-        # XXX: hack alert: translate possibly fake platforms (like "macosx64_graphene")
-        # into proper platforms by stripping away product or build type specific parts.
-        balrog_props["properties"]["platform"] = balrog_props["properties"]["platform"].split("-")[0].split("_")[0]
+        # XXX: hack alert, turn fake graphene platforms into real ones. This
+        # was done more generically originally (bug 1140437), but it broke
+        # flame-kk updates (bug 1141633)
+        balrog_props["properties"]["platform"] = balrog_props["properties"]["platform"].replace("_graphene", "")
         self.dump_config(props_path, balrog_props)
         cmd = [
             self.query_exe("python"),
             submitter_script,
             "--build-properties", props_path,
             "--api-root", c["balrog_api_root"],
             "--username", self._query_balrog_username(product),
             "-t", release_type,