Adding hikey960 with AEP to staging and PMWG

Change-Id: I71beb6cf84fa39d79d2eff14c178868895cbb597
Reviewed-on: https://review.linaro.org/23464
Reviewed-by: lava-bot
Reviewed-by: Maria Högberg <maria.hogberg@linaro.org>

5 files changed, 179 insertions, 2 deletions

diff --git a/pmwg.validation.linaro.org/dispatcher-configs/pmwg-server-01.pmwglab/ser2net.conf b/pmwg.validation.linaro.org/dispatcher-configs/pmwg-server-01.pmwglab/ser2net.conf
index 039116325..0a25b6506 100644
--- a/pmwg.validation.linaro.org/dispatcher-configs/pmwg-server-01.pmwglab/ser2net.conf
+++ b/pmwg.validation.linaro.org/dispatcher-configs/pmwg-server-01.pmwglab/ser2net.conf
@@ -8,7 +8,8 @@ BANNER:dragonboard:\r\nDragonboard 410c - port \p [\s]\r\n\r\n
 BANNER:juno-r2:\r\nJuno R2 \p [\s]\r\n\r\n
 BANNER:hikey6220:\r\nHiKey6220 \p [\s]\r\n\r\n
 BANNER:b2260:\r\nb2260 \p [\s]\r\n\r\n
-BANNER:hikey960:\r\nHiKey960 \p [\s]\r\n\r\n
+BANNER:hikey960-01:\r\nHiKey960 01 \p [\s]\r\n\r\n
+BANNER:hikey960-02:\r\nHiKey960 02 \p [\s]\r\n\r\n
 
 7101:telnet:0:/dev/serial/by-id/usb-FTDI_FT230X_Basic_UART_DN006EU6-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL cambrionix
 7102:telnet:0:/dev/serial/by-id/usb-FTDI_USB_HS_SERIAL_CONVERTER_FTGOS2Q2-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL panda
@@ -20,7 +21,8 @@ BANNER:hikey960:\r\nHiKey960 \p [\s]\r\n\r\n
 7108:telnet:0:/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_AI03FFF8-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL juno-r2
 7109:telnet:0:/dev/serial/by-id/usb-FTDI_TTL232RG-VREG1V8_FT0ED23E-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL hikey6220
 7110:telnet:0:/dev/serial/by-id/usb-FTDI_FT230X_96Boards_Console_DAZ0K44L-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL b2260
-7111:telnet:0:/dev/serial/by-id/usb-FTDI_FT230X_96Boards_Console_DA6ZEB0-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL hikey960
+7111:telnet:0:/dev/serial/by-id/usb-FTDI_FT230X_96Boards_Console_DA6ZEB0-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL hikey960-01
+7112:telnet:0:/dev/serial/by-id/usb-FTDI_FT230X_96Boards_Console_DA1G0MME-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL hikey960-02
 
 7201:telnet:0:/dev/serial/by-id/usb-FTDI_FT230X_Basic_UART_DN00HZL2-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL cambrionix
 
diff --git a/pmwg.validation.linaro.org/master-configs/pmwg-server-01.pmwglab/lava-server/dispatcher-config/devices/hi960-hikey-02.jinja2 b/pmwg.validation.linaro.org/master-configs/pmwg-server-01.pmwglab/lava-server/dispatcher-config/devices/hi960-hikey-02.jinja2
new file mode 100644
index 000000000..884ed6d23
--- /dev/null
+++ b/pmwg.validation.linaro.org/master-configs/pmwg-server-01.pmwglab/lava-server/dispatcher-config/devices/hi960-hikey-02.jinja2
@@ -0,0 +1,18 @@
+{% extends 'hi960-hikey.jinja2' %}
+{% set fastboot_options = ['-S', '256M', '-u'] %}
+{% set exclusive = 'True' %}
+{% set hard_reset_command = ['/usr/local/lab-scripts/snmp_pdu_control --hostname pdu02 --command reboot --port 1'] %}
+{% set pre_os_command = '/usr/local/lab-scripts/usb_hub_control -p 7201 -u 4 -m off' %}
+{% set pre_power_command = '/usr/local/lab-scripts/usb_hub_control -p 7201 -u 4 -m sync' %}
+{% set interrupt_prompt = 'Android Fastboot mode' %}
+{% set interrupt_string = "' '" %}
+{% set soft_reset_command = 'fastboot -u -s 3E0676510140B08B reboot' %}
+{% set power_off_command = '/usr/local/lab-scripts/snmp_pdu_control --hostname pdu02 --command off --port 1' %}
+{% set fastboot_serial_number = '3E0676510140B08B' %}
+{% set device_info = [{'board_id': '3E0676510140B08B'}] %}
+{% set static_info = [{'board_id': 'S_NO36600076'}] %}
+{% set adb_serial_number = '3E0676510140B08B' %}
+{% set power_on_command = '/usr/local/lab-scripts/snmp_pdu_control --hostname pdu02 --command on --port 1' %}
+{% set connection_command = 'telnet localhost 7112' %}
+{% set flash_cmds_order = ['ptable', 'fastboot', 'nvme', 'boot', 'cache', 'system', 'userdata'] %}
+{% set device_mac = '8a:ce:4c:ff:a7:94' %}
diff --git a/shared/server-configs/ser2net.conf b/shared/server-configs/ser2net.conf
index a53139e16..6a16b009d 100644
--- a/shared/server-configs/ser2net.conf
+++ b/shared/server-configs/ser2net.conf
@@ -7,6 +7,7 @@ BANNER:cubietruck:\r\nCubietruck \p [\s]\r\n\r\n
 BANNER:db410c:\r\nDragonboard 410c \p [\s]\r\n\r\n
 BANNER:hikey:\r\n96Boards HiKey \p [\s]\r\n\r\n
 BANNER:hikey-aep:\r\n96Boards HiKey with AEP \p [\s]\r\n\r\n
+BANNER:hikey960-aep:\r\n96Boards HiKey960 with AEP \p [\s]\r\n\r\n
 BANNER:ifc6410:\r\nIFC6410 \p [\s]\r\n\r\n
 BANNER:kw41z:\r\nFRDM KW41Z \p [\s]\r\n\r\n
 BANNER:k64f:\r\nFRDM K64F \p [\s]\r\n\r\n
@@ -42,6 +43,7 @@ BANNER:pp15-hikey:\r\nCambrionix USB Hub Management Interface - Hikeys dedicated
 7122::telnet:0:/dev/serial/by-id/usb-ARM_DAPLink_CMSIS-DAP_0201000032254e4500178002ab9a0009c0b1000097969900-if01:115200 8DATABITS NONE 1STOPBIT LOCAL kw41z
 7123::telnet:0:/dev/serial/by-id/usb-FTDI_TTL232RG-VREG1V8_FT0ED23E-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL hikey-aep
 7124::telnet:0:/dev/serial/by-id/usb-FTDI_TTL232R-3V3_FTAJM1BV-if00-port0:115200 8DATABITS NONE 1STOPBIT rpi3b-32
+7125:telnet:0:/dev/serial/by-id/usb-FTDI_FT230X_96Boards_Console_DA1G0RU6-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL hikey960-aep
 
 7501:telnet:0:/dev/serial/by-id/usb-FTDI_FT230X_Basic_UART_DQ0076SW-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL pp15
 7502:telnet:0:/dev/serial/by-id/usb-FTDI_FT230X_Basic_UART_DJ008WLX-if00-port0:115200 8DATABITS NONE 1STOPBIT LOCAL pp15
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi960-hikey-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi960-hikey-01.jinja2
new file mode 100644
index 000000000..d4ca43748
--- /dev/null
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi960-hikey-01.jinja2
@@ -0,0 +1,18 @@
+{% extends 'hi960-hikey.jinja2' %}
+{% set fastboot_options = ['-S', '256M', '-u'] %}
+{% set exclusive = 'True' %}
+{% set hard_reset_command = ['/usr/local/lab-scripts/snmp_pdu_control --hostname pdu15 --command reboot --port 4'] %}
+{% set pre_os_command = '/usr/local/lab-scripts/usb_hub_control -p 7501 -u 9 -m off' %}
+{% set pre_power_command = '/usr/local/lab-scripts/usb_hub_control -p 7501 -u 9 -m sync' %}
+{% set interrupt_prompt = 'Android Fastboot mode' %}
+{% set interrupt_string = "' '" %}
+{% set soft_reset_command = 'fastboot -u -s 389EB79C014867EC reboot' %}
+{% set power_off_command = '/usr/local/lab-scripts/snmp_pdu_control --hostname pdu15 --command off --port 4' %}
+{% set fastboot_serial_number = '389EB79C014867EC' %}
+{% set device_info = [{'board_id': '389EB79C014867EC'}] %}
+{% set static_info = [{'board_id': 'S_NO36600077'}] %}
+{% set adb_serial_number = '389EB79C014867EC' %}
+{% set power_on_command = '/usr/local/lab-scripts/snmp_pdu_control --hostname pdu15 --command on --port 4' %}
+{% set connection_command = 'telnet localhost 7125' %}
+{% set flash_cmds_order = ['ptable', 'fastboot', 'nvme', 'boot', 'cache', 'system', 'userdata'] %}
+{% set device_mac = '80:3f:5d:09:03:2a' %}
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/health-checks/hi960-hikey.yaml b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/health-checks/hi960-hikey.yaml
new file mode 100644
index 000000000..ba400715f
--- /dev/null
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/health-checks/hi960-hikey.yaml
@@ -0,0 +1,137 @@
+device_type: hi960-hikey
+job_name: HiKey960 oe boot test
+timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: medium
+visibility: public
+
+metadata:
+  source: https://git.linaro.org/lava/lava-lab.git
+  path: pmwg.validation.linaro.org/lava/pipeline/health-checks/hi960-hikey.yaml
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-oe
+    template: debian
+    distribution: debian
+    release: jessie
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    to: lxc
+    packages:
+    - android-tools-adb
+    - android-tools-fastboot
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- deploy:
+    timeout:
+      minutes: 30
+    to: fastboot
+    namespace: hikey-oe
+    images:
+      ptable:
+        url: http://images.validation.linaro.org/builds.96boards.org/snapshots/reference-platform/components/uefi-staging/34/hikey960/release/prm_ptable.img
+        reboot: hard-reset
+      boot:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/reference-platform/embedded/morty/hikey960/104/rpb/boot-0.0+AUTOINC+ba45819943-ea12986b87-r0-hikey960-20171102134258-104.uefi.img
+        reboot: hard-reset
+      system:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/reference-platform/embedded/morty/hikey960/104/rpb/rpb-console-image-lava-hikey960-20171102134258-104.rootfs.img.gz
+        compression: gz
+        reboot: hard-reset
+        apply-overlay: true 
+    os: oe
+    protocols:
+        lava-lxc:
+        - action: fastboot-deploy
+          request: pre-power-command
+          timeout:
+              minutes: 2
+
+
+- boot:
+    namespace: hikey-oe
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+    failure_retry: 3
+    prompts:
+    - 'root@hikey960:'
+    timeout:
+      minutes: 10
+    method: grub
+    commands: installed
+
+- test:
+    namespace: hikey-oe
+    timeout:
+      minutes: 5
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: basic-tests
+          description: "Basic filesystem checks"
+        run:
+          steps:
+          - lava-test-case df --shell df
+          - lava-test-case uname --shell uname -a
+          - lava-test-case ls --shell ls /
+          - lava-test-case mount --shell mount
+      name: 960-inline
+      path: inline/basic.yaml
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 5
+    definitions:
+    - repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: probe
+          description: "check probe"
+          os:
+          - debian
+          scope:
+          - functional
+        install:
+          deps:
+          - usbutils
+          - git
+          - make
+        run:
+          steps:
+          - lava-test-case find_probe --shell ls /dev/serial/by-id/usb-NXP_SEMICOND_ARM_Energy_Probe_S_NO17110201-if00
+      from: inline
+      name: find-probe
+      path: inline/find-probe.yaml
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/lava-team/refactoring.git
+      from: git
+      path: testdefs/arm-probe.yaml
+      name: arm-probe