~pwlars/ubuntu-test-cases/krillin-recovery

« back to all changes in this revision

Viewing changes to scripts/device_info.py

  • Committer: Paul Larson
  • Date: 2014-11-05 20:34:00 UTC
  • Revision ID: paul.larson@canonical.com-20141105203400-rale94wat3x7rhp0
just use stable image for all devices

Show diffs side-by-side

added added

removed removed

Lines of Context:
58
58
    def reimage_from_fastboot(self):
59
59
        #Starting from fastboot mode, put a known-good image on the device
60
60
        log.info("Flashing the last stable image")
61
 
        if self.devtype == "krillin":
62
 
            subprocess.check_output(['ubuntu-device-flash', '--serial',
63
 
                                     self.serial, '--channel',
64
 
                                     'ubuntu-touch/ubuntu-rtm/14.09-proposed',
65
 
                                     '--bootstrap', '--revision=141',
66
 
                                     '--developer-mode',
67
 
                                     '--password', 'ubuntuci'])
68
 
        else:
69
 
            subprocess.check_output(['ubuntu-device-flash', '--serial',
70
 
                                     self.serial, '--channel',
71
 
                                     'ubuntu-touch/stable', '--bootstrap',
72
 
                                     '--developer-mode',
73
 
                                     '--password', 'ubuntuci'])
 
61
        subprocess.check_output(['ubuntu-device-flash', '--serial',
 
62
                                 self.serial, '--channel',
 
63
                                 'ubuntu-touch/stable', '--bootstrap',
 
64
                                 '--developer-mode',
 
65
                                 '--password', 'ubuntuci'])
74
66
        return self.wait_for_device(600)
75
67
 
76
68
    def wait_for_fastboot(self, timeout=120):