Merge lp:~sergiusens/phablet-tools/revision-ub into lp:phablet-tools

[Sergio Schvezov]

Adding option to ubuntu bootstrap a relative revision and explicitly delete /data/.developer_mode. Cosmetic pep8 fixes as well

To flash the latest ubuntu bootstrap (system image based upgrade) do
phablet-flash --ubuntu-bootstrap

To flash with a revision,
This will flash the latest:
phablet-flash --ubuntu-bootstrap --revision 0

While this will flash the version prior to the latest:
phablet-flash --ubuntu-bootstrap --revision -1

Notice that after flashing you should NOT be in developer mode.

phablet-flash is under a refactor to clean up the latest hacks and support different install options so don't be to focused on where the code is, just that it does the right thing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/64

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/121/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good.

review: Approve

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Works well!

review: Approve

=== modified file 'phablet-flash'
--- phablet-flash	2013-07-19 22:44:08 +0000
+++ phablet-flash	2013-07-30 17:22:25 +0000
@@ -102,7 +102,10 @@
                        required=False,
                        default=None,
                        help='''Choose a specific release to install from 
-                               cdimage, the format is [series]/[rev].''',
+                               cdimage, the format is [series]/[rev].
+                               However for ubuntu-bootstrap it's a 
+                               relative number 0 being latest -1 being
+                               the previous version and so on''',
                        )
     group.add_argument('-l',
                        '--latest-revision',
@@ -129,12 +132,12 @@
                        required=False,
                        help='Get pending link from cdimage',
                       )
-    group.add_argument('--ubuntu-bootstrap',
-                       action='store_true',
-                       required=False,
-                       help='''Flash the image based upgrade Ubuntu system.
-                               This action wipes the system'''
-                      )
+    parser.add_argument('--ubuntu-bootstrap',
+                        action='store_true',
+                        required=False,
+                        help='''Flash the image based upgrade Ubuntu system.
+                                This action wipes the system'''
+                       )
     return parser.parse_args()
 
 
@@ -266,7 +269,7 @@
 
 def wipe_device(adb):
     log.info('Clearing /data and /cache')
-    adb.shell('rm -Rf /cache/* /data/*')
+    adb.shell('rm -Rf /cache/* /data/* /data/.developer_mode')
     adb.shell('mkdir /cache/recovery')
     adb.shell('mkdir /data/media')
 
@@ -346,12 +349,12 @@
 
 
 @adb_errors
-def setup_ubuntu_image_update(device):
+def setup_ubuntu_image_update(device, revision=-1):
     '''
     Sets up as described in https://wiki.ubuntu.com/ImageBasedUpgrades.
     '''
     # This is temporary until more commonality is found.
-    json_latest = ubuntuimage.get_json_latest_from_index(device)
+    json_latest = ubuntuimage.get_json_from_index(device, revision)
     download_dir = environment.get_download_dir_full_path(
         os.path.join(settings.download_dir,'imageupdates',
             str(json_latest['version'])))
@@ -380,6 +383,14 @@
     if args.legacy and args.pending:
         log.error('Cannot use legacy and pending together')
         exit(1)
+    if args.ubuntu_bootstrap and args.revision:
+        ubuntu_revision = int(args.revision) - 1
+        if ubuntu_revision >= 0:
+            log.error('Revision must be 0 for current or negative number')
+            exit(1)
+        args.revision = None
+    else:
+        ubuntu_revision = -1
     if args.list_revisions:
         # Easy hack to get rid of the logger and inhibit requests from logging
         log.setLevel(logging.FATAL)
@@ -437,7 +448,7 @@
     if not args.download_only:
         if args.ubuntu_bootstrap:
             ubuntu_files, ubuntu_command_path = \
-                setup_ubuntu_image_update(device) 
+                setup_ubuntu_image_update(device, ubuntu_revision) 
             deploy_ubuntu_image_update(adb, fastboot, env.recovery_img_path,
                 ubuntu_files, ubuntu_command_path)
         elif args.bootstrap:

=== modified file 'phabletutils/ubuntuimage.py'
--- phabletutils/ubuntuimage.py	2013-07-19 22:55:09 +0000
+++ phabletutils/ubuntuimage.py	2013-07-30 17:22:25 +0000
@@ -20,16 +20,17 @@
 from phabletutils import downloads
 from phabletutils import settings
 
-def get_json_latest_from_index(device):
+
+def get_json_from_index(device, index=-1):
     """Returns json index for device"""
     json_index_uri = '%s/daily/%s/index.json' % \
         (settings.system_image_uri, device)
     json_index_request = requests.get(json_index_uri)
     json_index = json.loads(json_index_request.content)
-    latest = sorted([entry for entry in json_index['images']
-                     if entry['type'] == "full"],
-                    key=lambda entry: entry['version'])[-1]
-    return latest
+    version_data = sorted([entry for entry in json_index['images']
+                          if entry['type'] == "full"],
+                          key=lambda entry: entry['version'])[index]
+    return version_data
 
 
 def download_images(download_dir, json_list):
@@ -44,8 +45,8 @@
         signame_uri = '%s/%s' % (settings.system_image_uri, entry['signature'])
         downloads.download(filename_uri, filename_path)
         downloads.download(signame_uri, signame_path)
-        files['updates'].append({'filename': filename_path, 
-            'signame': signame_path})
+        files['updates'].append({'filename': filename_path,
+                                 'signame': signame_path})
     files['base'] = []
     for keyring in ('image-master', 'image-signing'):
         filename = '%s.tar.xz' % keyring
@@ -56,6 +57,6 @@
         signame_uri = '%s.asc' % filename_uri
         downloads.download(filename_uri, filename_path)
         downloads.download(signame_uri, signame_path)
-        files['base'].append({'filename': filename_path, 
-            'signame': signame_path})
+        files['base'].append({'filename': filename_path,
+                              'signame': signame_path})
     return files