Add hikey6220-r2 functional tests

Change-Id: I2a93a6ab87c52e28aaae4fbb87ce95be8b96f145

2 files changed, 31 insertions, 63 deletions

diff --git a/hi6220-hikey-aosp.yaml b/hi6220-hikey-aosp.yaml
index ff87584..b9a7881 100644
--- a/hi6220-hikey-aosp.yaml
+++ b/hi6220-hikey-aosp.yaml
@@ -1,5 +1,5 @@
-device_type: hi6220-hikey
-job_name: Jessie LXC HiKey AOSP
+device_type: hi6220-hikey-r2
+job_name: Stretch LXC HiKey AOSP
 timeouts:
   job:
     minutes: 60
@@ -19,8 +19,8 @@ protocols:
     name: lxc-hikey-test
     template: debian
     distribution: debian
-    release: jessie
-    verbose: true
+    release: stretch
+    mirror: http://mirror.bytemark.co.uk/debian
 
 actions:
 - deploy:
@@ -29,15 +29,15 @@ actions:
       minutes: 5
     to: lxc
     packages:
-    - android-tools-adb
-    - android-tools-fastboot
+    - adb
+    - fastboot
     os: debian
 
 - boot:
     namespace: tlxc
     prompts:
-    - 'root@(.*):/#'
-    - 'hikey:/'
+    - 'root@(.*):'
+    - 'hikey: '
     timeout:
       minutes: 5
     method: lxc
@@ -46,10 +46,10 @@ actions:
     timeout:
       minutes: 15
     to: fastboot
-    namespace: droid
+    namespace: hikey
     images:
       ptable:
-        url: http://images.validation.linaro.org/builds.96boards.org/snapshots/reference-platform/components/uefi/latest/release/hikey/ptable-aosp-8g.img
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/59/hikey/release/ptable-aosp-8g.img
         reboot: hard-reset
       boot:
         url: http://images.validation.linaro.org/builds.96boards.org/snapshots/hikey/linaro/aosp-master/357/boot.img.xz
@@ -66,17 +66,17 @@ actions:
         compression: xz
     os: debian
     protocols:
-      lava-lxc:
-      - action: fastboot-deploy
-        request: pre-power-command
-        timeout:
-          minutes: 2
+        lava-lxc:
+        - action: fastboot-deploy
+          request: pre-power-command
+          timeout:
+              minutes: 2
 
 - boot:
-    namespace: droid
+    namespace: hikey
     prompts:
-    - 'root@(.*):/#'
-    - 'hikey:/'
+    - 'healthd: No battery devices found'
+    - 'hikey: '
     timeout:
       minutes: 15
     method: fastboot
@@ -86,35 +86,6 @@ actions:
     timeout:
       minutes: 5
     definitions:
-    - repository: https://git.linaro.org/lava-team/lava-functional-tests.git
-      from: git
-      path: lava-test-shell/android/get-adb-serial-hikey.yaml
-      name: get-hikey-serial
-
-    - from: inline
-      name: add-device-to-lxc
-      path: inline/hikey-target.yaml
-      repository:
-        metadata:
-          description: hikey target tests
-          format: Lava-Test Test Definition 1.0
-          name: hikey-target
-        run:
-          steps:
-          - ls -lR /dev/bus/usb
-
-    - from: inline
-      name: check-device-in-lxc
-      path: inline/hikey-target.yaml
-      repository:
-        metadata:
-          description: hikey target tests
-          format: Lava-Test Test Definition 1.0
-          name: hikey-target-check
-        run:
-          steps:
-          - ls -lR /dev/bus/usb
-
     - repository: https://git.linaro.org/lava-team/refactoring.git/
       from: git
       path: android/lava-android-basic-lxc.yaml
diff --git a/hi6220-hikey-oe.yaml b/hi6220-hikey-oe.yaml
index a2d71ce..10cbbdd 100644
--- a/hi6220-hikey-oe.yaml
+++ b/hi6220-hikey-oe.yaml
@@ -1,8 +1,8 @@
-device_type: hi6220-hikey
+device_type: hi6220-hikey-r2
 job_name: HiKey OE
 timeouts:
   job:
-    minutes: 30
+    minutes: 60
   action:
     minutes: 15
   connection:
@@ -10,8 +10,6 @@ timeouts:
 priority: medium
 visibility: public
 
-# run udhcpc in the test shell before accessing the internet
-
 metadata:
   source: https://git.linaro.org/lava-team/refactoring.git
   path: hikey-oe.yaml
@@ -21,7 +19,8 @@ protocols:
     name: lxc-hikey-oe
     template: debian
     distribution: debian
-    release: jessie
+    release: stretch
+    mirror: http://mirror.bytemark.co.uk/debian
 
 actions:
 - deploy:
@@ -30,27 +29,28 @@ actions:
       minutes: 15
     to: lxc
     packages:
-    - android-tools-fastboot
+    - adb
+    - fastboot
     os: debian
 
 - boot:
     namespace: tlxc
     prompts:
-    - 'root@(.*):/#'
-    - 'hikey:/'
+    - 'root@(.*):'
+    - 'hikey: '
     timeout:
       minutes: 5
     method: lxc
 
 - deploy:
     timeout:
-      minutes: 30
+      minutes: 45
     to: fastboot
     namespace: hikey-oe
     connection: lxc
     images:
       ptable:
-        url: http://images.validation.linaro.org/snapshots.linaro.org/openembedded/lkft/morty/hikey/rpb/4.9/83/bootloader/ptable-linux-8g.img
+        url: http://images.validation.linaro.org/builds.96boards.org/snapshots/reference-platform/components/uefi-staging/49/hikey/release/ptable-linux-8g.img
         reboot: hard-reset
       boot:
         url: http://images.validation.linaro.org/snapshots.linaro.org/openembedded/lkft/morty/hikey/rpb/4.9/83/boot-0.0+AUTOINC+06e4def583-fb1158a365-r0-hikey-20170713193031-83.uefi.img
@@ -59,7 +59,6 @@ actions:
         url: http://images.validation.linaro.org/snapshots.linaro.org/openembedded/lkft/morty/hikey/rpb/4.9/83/rpb-console-image-hikey-20170808001820-83.rootfs.img.gz
         compression: gz
         apply-overlay: true
-        # ensure that this job raises a network interface with DHCP before relying on internet access
     os: oe
     protocols:
       lava-lxc:
@@ -67,7 +66,6 @@ actions:
         request: pre-power-command
         timeout:
           minutes: 2
-
 - boot:
     namespace: hikey-oe
     auto_login:
@@ -77,12 +75,11 @@ actions:
     - 'root@hikey:~#'
     timeout:
       minutes: 5
-    method: uefi-menu
-    commands: fastboot
+    method: grub
+    commands: installed
     protocols:
       lava-lxc:
-      # other action could be boot-fastboot
-      - action: uefi-commands
+      - action: grub-sequence-action
         request: pre-os-command
         timeout:
           minutes: 2