lt-qcom-linux-integration: LAVA functional template fix boot prompt

Recently we changed to use generic arm64 ramdisk images for all the
boards.

- Remove BOOT_OS_PROMPT per board.
- Update boot regex on LAVA template to generic.
- Use the same base template for DB{410,820}c.

Change-Id: Ibf027973f4c8daeabc2322541f3269bd0d5257ad
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>

5 files changed, 129 insertions, 263 deletions

diff --git a/lt-qcom-linux-integration/lava-job-definitions/boards/base_template-functional.yaml b/lt-qcom-linux-integration/lava-job-definitions/boards/base_template-functional.yaml
new file mode 100644
index 0000000000..d59286ba7c
--- /dev/null
+++ b/lt-qcom-linux-integration/lava-job-definitions/boards/base_template-functional.yaml
@@ -0,0 +1,126 @@
+protocols:
+  lava-lxc:
+    name: lxc-${LAVA_DEVICE_TYPE}-test
+    template: debian
+    distribution: debian
+    release: stretch
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 5
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    - img2simg
+    - simg2img
+    - e2fsprogs
+    - gzip
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - 'root@linaro-developer:~#'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- deploy:
+    timeout:
+      minutes: 40
+    to: download
+    namespace: ${LAVA_DEVICE_TYPE}
+    images:
+      boot:
+        url: ${BOOT_ROOTFS_URL}
+        compression: ${BOOT_ROOTFS_URL_COMP}
+      rootfs:
+        url: ${ROOTFS_URL}
+        compression: ${ROOTFS_URL_COMP}
+    os: oe
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 30
+    definitions:
+    - from: inline
+      name: resize-rootfs
+      path: inline/resize-rootfs.yaml
+      repository:
+        metadata:
+          description: resize rootfs image for test overlay
+          format: Lava-Test Test Definition 1.0
+          name: resize-rootfs
+        run:
+          steps:
+          - if [ -z "${RESIZE_ROOTFS}" ]
+          - then
+          -     echo "resize_rootfs:" "skip"
+          - else
+          -     cd /lava-lxc
+          -     overlay_file=/lava-lxc/overlays/${LAVA_DEVICE_TYPE}/overlay.tar.gz
+          -     overlay_size=$$(gzip -l $$overlay_file | tail -1 | awk '{print $$2}')
+          -     overlay_size=$$(( $$overlay_size / 1024 ))
+          -     simg2img ${LXC_ROOTFS_FILE} ${LXC_ROOTFS_FILE}.ext4
+          -     fsck_code=$$(e2fsck -y -f ${LXC_ROOTFS_FILE}.ext4)
+          -     block_count=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block count" | awk '{print $$3}')
+          -     block_size=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block size" | awk '{print $$3}')
+          -     current_size=$$(( $$block_size * $$block_count / 1024 ))
+          -     final_size=$$(( $$current_size + $$overlay_size + 32768 ))
+          -     resize2fs ${LXC_ROOTFS_FILE}.ext4 "$$final_size"K
+          -     img2simg ${LXC_ROOTFS_FILE}.ext4 ${LXC_ROOTFS_FILE}
+          -     echo "resize_rootfs:" "pass"
+          - fi
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2602
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.2-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 40
+    to: fastboot
+    namespace: ${LAVA_DEVICE_TYPE}
+    images:
+      boot:
+        url: lxc:///${LXC_BOOT_ROOTFS_FILE}
+      rootfs:
+        url: lxc:///${LXC_ROOTFS_FILE}
+        apply-overlay: true
+    os: oe
+    protocols:
+        lava-lxc:
+        - action: fastboot-deploy
+          request: pre-power-command
+          timeout:
+              minutes: 2
+
+- boot:
+    namespace: ${LAVA_DEVICE_TYPE}
+    auto_login:
+      login_prompt: 'login:'
+      username: 'root'
+    prompts:
+    - 'root@(.*):~#'
+    timeout:
+      minutes: 15
+    method: fastboot
+    protocols:
+      lava-lxc:
+      - action: auto-login-action
+        request: pre-os-command
+        timeout:
+          minutes: 2
diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template-functional.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template-functional.yaml
index 0f35a4ab12..1adb0e98a0 100644..120000
--- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template-functional.yaml
+++ b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template-functional.yaml
@@ -1,127 +1 @@
-protocols:
-  lava-lxc:
-    name: lxc-${LAVA_DEVICE_TYPE}-test
-    template: debian
-    distribution: debian
-    release: stretch
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 5
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    - img2simg
-    - simg2img
-    - e2fsprogs
-    - gzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    - 'root@linaro-developer:~#'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- deploy:
-    timeout:
-      minutes: 40
-    to: download
-    namespace: ${LAVA_DEVICE_TYPE}
-    images:
-      boot:
-        url: ${BOOT_ROOTFS_URL}
-        compression: ${BOOT_ROOTFS_URL_COMP}
-      rootfs:
-        url: ${ROOTFS_URL}
-        compression: ${ROOTFS_URL_COMP}
-    os: oe
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 30
-    definitions:
-    - from: inline
-      name: resize-rootfs
-      path: inline/resize-rootfs.yaml
-      repository:
-        metadata:
-          description: resize rootfs image for test overlay
-          format: Lava-Test Test Definition 1.0
-          name: resize-rootfs
-        run:
-          steps:
-          - if [ -z "${RESIZE_ROOTFS}" ]
-          - then
-          -     echo "resize_rootfs:" "skip"
-          - else
-          -     cd /lava-lxc
-          -     overlay_file=/lava-lxc/overlays/${LAVA_DEVICE_TYPE}/overlay.tar.gz
-          -     overlay_size=$$(gzip -l $$overlay_file | tail -1 | awk '{print $$2}')
-          -     overlay_size=$$(( $$overlay_size / 1024 ))
-          -     simg2img ${LXC_ROOTFS_FILE} ${LXC_ROOTFS_FILE}.ext4
-          -     fsck_code=$$(e2fsck -y -f ${LXC_ROOTFS_FILE}.ext4)
-          -     block_count=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block count" | awk '{print $$3}')
-          -     block_size=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block size" | awk '{print $$3}')
-          -     current_size=$$(( $$block_size * $$block_count / 1024 ))
-          -     final_size=$$(( $$current_size + $$overlay_size + 32768 ))
-          -     resize2fs ${LXC_ROOTFS_FILE}.ext4 "$$final_size"K
-          -     img2simg ${LXC_ROOTFS_FILE}.ext4 ${LXC_ROOTFS_FILE}
-          -     echo "resize_rootfs:" "pass"
-          - fi
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/android-platform-tools/install.yaml
-      name: install-android-platform-tools-r2602
-      parameters:
-        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.2-linux.zip'
-
-- deploy:
-    timeout:
-      minutes: 40
-    to: fastboot
-    namespace: ${LAVA_DEVICE_TYPE}
-    images:
-      boot:
-        url: lxc:///${LXC_BOOT_ROOTFS_FILE}
-      rootfs:
-        url: lxc:///${LXC_ROOTFS_FILE}
-        apply-overlay: true
-    os: oe
-    protocols:
-        lava-lxc:
-        - action: fastboot-deploy
-          request: pre-power-command
-          timeout:
-              minutes: 2
-
-- boot:
-    namespace: ${LAVA_DEVICE_TYPE}
-    auto_login:
-      login_prompt: 'login:'
-      username: 'root'
-    prompts:
-    - 'root@(.*):/#'
-    - ${BOOT_OS_PROMPT}
-    timeout:
-      minutes: 15
-    method: fastboot
-    protocols:
-      lava-lxc:
-      - action: auto-login-action
-        request: pre-os-command
-        timeout:
-          minutes: 2
+../boards/base_template-functional.yaml
\ No newline at end of file
diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/base_template-functional.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/base_template-functional.yaml
index 0f35a4ab12..1adb0e98a0 100644..120000
--- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/base_template-functional.yaml
+++ b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/base_template-functional.yaml
@@ -1,127 +1 @@
-protocols:
-  lava-lxc:
-    name: lxc-${LAVA_DEVICE_TYPE}-test
-    template: debian
-    distribution: debian
-    release: stretch
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 5
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    - img2simg
-    - simg2img
-    - e2fsprogs
-    - gzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    - 'root@linaro-developer:~#'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- deploy:
-    timeout:
-      minutes: 40
-    to: download
-    namespace: ${LAVA_DEVICE_TYPE}
-    images:
-      boot:
-        url: ${BOOT_ROOTFS_URL}
-        compression: ${BOOT_ROOTFS_URL_COMP}
-      rootfs:
-        url: ${ROOTFS_URL}
-        compression: ${ROOTFS_URL_COMP}
-    os: oe
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 30
-    definitions:
-    - from: inline
-      name: resize-rootfs
-      path: inline/resize-rootfs.yaml
-      repository:
-        metadata:
-          description: resize rootfs image for test overlay
-          format: Lava-Test Test Definition 1.0
-          name: resize-rootfs
-        run:
-          steps:
-          - if [ -z "${RESIZE_ROOTFS}" ]
-          - then
-          -     echo "resize_rootfs:" "skip"
-          - else
-          -     cd /lava-lxc
-          -     overlay_file=/lava-lxc/overlays/${LAVA_DEVICE_TYPE}/overlay.tar.gz
-          -     overlay_size=$$(gzip -l $$overlay_file | tail -1 | awk '{print $$2}')
-          -     overlay_size=$$(( $$overlay_size / 1024 ))
-          -     simg2img ${LXC_ROOTFS_FILE} ${LXC_ROOTFS_FILE}.ext4
-          -     fsck_code=$$(e2fsck -y -f ${LXC_ROOTFS_FILE}.ext4)
-          -     block_count=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block count" | awk '{print $$3}')
-          -     block_size=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block size" | awk '{print $$3}')
-          -     current_size=$$(( $$block_size * $$block_count / 1024 ))
-          -     final_size=$$(( $$current_size + $$overlay_size + 32768 ))
-          -     resize2fs ${LXC_ROOTFS_FILE}.ext4 "$$final_size"K
-          -     img2simg ${LXC_ROOTFS_FILE}.ext4 ${LXC_ROOTFS_FILE}
-          -     echo "resize_rootfs:" "pass"
-          - fi
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/android-platform-tools/install.yaml
-      name: install-android-platform-tools-r2602
-      parameters:
-        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.2-linux.zip'
-
-- deploy:
-    timeout:
-      minutes: 40
-    to: fastboot
-    namespace: ${LAVA_DEVICE_TYPE}
-    images:
-      boot:
-        url: lxc:///${LXC_BOOT_ROOTFS_FILE}
-      rootfs:
-        url: lxc:///${LXC_ROOTFS_FILE}
-        apply-overlay: true
-    os: oe
-    protocols:
-        lava-lxc:
-        - action: fastboot-deploy
-          request: pre-power-command
-          timeout:
-              minutes: 2
-
-- boot:
-    namespace: ${LAVA_DEVICE_TYPE}
-    auto_login:
-      login_prompt: 'login:'
-      username: 'root'
-    prompts:
-    - 'root@(.*):/#'
-    - ${BOOT_OS_PROMPT}
-    timeout:
-      minutes: 15
-    method: fastboot
-    protocols:
-      lava-lxc:
-      - action: auto-login-action
-        request: pre-os-command
-        timeout:
-          minutes: 2
+../boards/base_template-functional.yaml
\ No newline at end of file
diff --git a/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/base_template-functional.yaml b/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/base_template-functional.yaml
index f7ee814d89..bd033302ab 100644
--- a/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/base_template-functional.yaml
+++ b/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/base_template-functional.yaml
@@ -97,8 +97,7 @@ actions:
       login_prompt: 'login:'
       username: 'root'
     prompts:
-    - 'root@(.*):/#'
-    - ${BOOT_OS_PROMPT}
+    - 'root@(.*):~#'
     timeout:
       minutes: 15
     method: fastboot
diff --git a/lt-qcom-linux-integration/submit_for_testing.sh b/lt-qcom-linux-integration/submit_for_testing.sh
index 68d96be085..c7485fa93d 100755
--- a/lt-qcom-linux-integration/submit_for_testing.sh
+++ b/lt-qcom-linux-integration/submit_for_testing.sh
@@ -35,8 +35,6 @@ case "${MACHINE}" in
       export WLAN_TIME_DELAY="0s"
       export ETH_DEVICE="eth0"
 
-      export BOOT_OS_PROMPT=\'root@dragonboard-410c:~#\'
-
     elif [ ${MACHINE} = "apq8096-db820c" ]; then
       export LAVA_DEVICE_TYPE="dragonboard-820c"
       export INSTALL_FASTBOOT=True
@@ -46,8 +44,6 @@ case "${MACHINE}" in
       export WLAN_TIME_DELAY="15s"
       export ETH_DEVICE="enP2p1s0"
 
-      export BOOT_OS_PROMPT=\'root@dragonboard-820c:~#\'
-
       if [ ${QA_SERVER_PROJECT} = "linux-master" ]; then
         SEND_TESTJOB=false
       fi
@@ -60,9 +56,6 @@ case "${MACHINE}" in
       export WLAN_TIME_DELAY="0s"
       export ETH_DEVICE="eth0"
 
-      # XXX: We are using db410c OE userspace
-      export BOOT_OS_PROMPT=\'root@dragonboard-410c:~#\'
-
       if [ ${QA_SERVER_PROJECT} = "linux-master" ]; then
         SEND_TESTJOB=false
       fi