~nuclearbob/ubuntu-test-cases/bootspeed-nfss

« back to all changes in this revision

Viewing changes to scripts/provision.sh

MergedĀ upstreamĀ changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
9
9
 
10
10
RESDIR=`pwd`/clientlogs
11
11
 
12
 
NETWORK_FILE="${NETWORK_FILE-/home/ubuntu/magners-wifi}"
 
12
NETWORK_FILE="${NETWORK_FILE-${HOME}/.ubuntu-ci/wifi.conf}"
13
13
 
14
14
IMAGE_OPT="${IMAGE_OPT---bootstrap --developer-mode --channel ubuntu-touch/devel-proposed}"
15
15
UUID="${UUID-$(uuidgen -r)}"
142
142
 
143
143
if [ -z $USE_EMULATOR ] ; then
144
144
        log "FLASHING DEVICE"
145
 
        if [ "${DEVICE_TYPE}" = "krillin" ]; then
146
 
                # reboot to recovery for krillin
147
 
                adb reboot recovery
148
 
                # Wait for recovery to boot
149
 
                sleep 30
150
 
        else
151
 
                adb reboot bootloader
152
 
        fi
 
145
        adb reboot bootloader
153
146
        ubuntu-device-flash --password ubuntuci $IMAGE_OPT
154
147
        adb wait-for-device
155
148
        sleep 60  #give the system a little time