Bug 1258099 - Update push_apk.py to manage apk v15 instead of v11 r=sylvestre
authorprimer <xorprimer@gmail.com>
Wed, 23 Mar 2016 15:21:53 +0100
changeset 290055 11ee5f2e12152c3f984dc3c8153b31693035f41b
parent 290054 0d344473d50fd8ead38d679e37c70adc449f200a
child 290056 bef0b9911c0b802e8bad189728bc3ef8620e8d40
push id30114
push usercbook@mozilla.com
push dateThu, 24 Mar 2016 15:15:54 +0000
treeherdermozilla-central@24c5fbde4488 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssylvestre
bugs1258099
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1258099 - Update push_apk.py to manage apk v15 instead of v11 r=sylvestre MozReview-Commit-ID: 3irQZHG5ja0
testing/mozharness/scripts/push_apk.py
--- a/testing/mozharness/scripts/push_apk.py
+++ b/testing/mozharness/scripts/push_apk.py
@@ -1,14 +1,14 @@
 #!/usr/bin/env python
 """ push_apk.py
 
     Upload the apk of a Firefox app on Google play
     Example for a beta upload:
-    $ python push_apk.py --package-name org.mozilla.firefox_beta --service-account foo@developer.gserviceaccount.com --credentials key.p12 --apk-x86=/path/to/fennec-XX.0bY.multi.android-i386.apk --apk-armv7-v9=/path/to/fennec-XX.0bY.multi.android-arm-v9.apk --apk-armv7-v11=/path/to/fennec-XX.0bY.multi.android-arm-v11.apk --track production --push_apk
+    $ python push_apk.py --package-name org.mozilla.firefox_beta --service-account foo@developer.gserviceaccount.com --credentials key.p12 --apk-x86=/path/to/fennec-XX.0bY.multi.android-i386.apk --apk-armv7-v9=/path/to/fennec-XX.0bY.multi.android-arm-v9.apk --apk-armv7-v15=/path/to/fennec-XX.0bY.multi.android-arm-v15.apk --track production --push_apk
 """
 import sys
 import os
 
 from oauth2client import client
 
 # load modules from parent dir
 sys.path.insert(1, os.path.dirname(sys.path[0]))
@@ -54,19 +54,19 @@ class PushAPK(BaseScript, GooglePlayMixi
         [["--apk-x86"], {
             "dest": "apk_file_x86",
             "help": "The path to the x86 APK file",
         }],
         [["--apk-armv7-v9"], {
             "dest": "apk_file_armv7_v9",
             "help": "The path to the ARM v7 API v9 APK file",
         }],
-        [["--apk-armv7-v11"], {
-            "dest": "apk_file_armv7_v11",
-            "help": "The path to the ARM v7 API v11 APK file",
+        [["--apk-armv7-v15"], {
+            "dest": "apk_file_armv7_v15",
+            "help": "The path to the ARM v7 API v15 APK file",
         }],
         [["--apk-armv6"], {
             "dest": "apk_file_armv6",
             "help": "The path to the ARM v6 APK file",
         }],
 
 
     ]
@@ -121,18 +121,18 @@ class PushAPK(BaseScript, GooglePlayMixi
                        self.config['package_name'])
 
         if not os.path.isfile(self.config['apk_file_x86']):
             self.fatal("Could not find " + self.config['apk_file_x86'])
 
         if not os.path.isfile(self.config['apk_file_armv7_v9']):
             self.fatal("Could not find " + self.config['apk_file_armv7_v9'])
 
-        if not os.path.isfile(self.config['apk_file_armv7_v11']):
-            self.fatal("Could not find " + self.config['apk_file_armv7_v11'])
+        if not os.path.isfile(self.config['apk_file_armv7_v15']):
+            self.fatal("Could not find " + self.config['apk_file_armv7_v15'])
 
         if self.config.get('apk_file_armv6') and not os.path.isfile(self.config['apk_file_armv6']):
             self.fatal("Could not find " + self.config['apk_file_armv6'])
 
         if not os.path.isfile(self.config['google_play_credentials_file']):
             self.fatal("Could not find " + self.config['google_play_credentials_file'])
 
     def upload_apks(self, service, apk_files):
@@ -180,17 +180,17 @@ class PushAPK(BaseScript, GooglePlayMixi
         commit_request = service.edits().commit(
             editId=edit_id, packageName=self.config['package_name']).execute()
         self.log('Edit "%s" has been committed' % (commit_request['id']))
 
     def push_apk(self):
         """ Upload the APK files """
         self.check_argument()
         service = self.connect_to_play()
-        apks = [self.config['apk_file_armv7_v9'], self.config['apk_file_armv7_v11'], self.config['apk_file_x86']]
+        apks = [self.config['apk_file_armv7_v9'], self.config['apk_file_armv7_v15'], self.config['apk_file_x86']]
         if self.config.get('apk_file_armv6'):
             apks.append(self.config['apk_file_armv6'])
         self.upload_apks(service, apks)
 
     def test(self):
         """ Test if the connexion can be done """
         self.check_argument()
         self.connect_to_play()