ledge: fix prompts for all ledge targets

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Change-Id: I9a31181592b65b3e4ed3bf5178e71c4a50d2a8a1

9 files changed, 28 insertions, 30 deletions

diff --git a/rpb-openembedded/lava-job-definitions/qemuarm/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemuarm/template-boot.yaml
index 1961b13f0c..5c2c68bf71 100644
--- a/rpb-openembedded/lava-job-definitions/qemuarm/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/qemuarm/template-boot.yaml
@@ -67,9 +67,9 @@ actions:
       login_commands:
         - sudo -s
     prompts:
-    - root@(.*):~#
-    - ledge@(.*):~#
-    - 'ledge.*$$'
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
 
 metadata:
   machine: ${MACHINE}
diff --git a/rpb-openembedded/lava-job-definitions/qemuarm64/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemuarm64/template-boot.yaml
index d81cf6159c..b3a1565d17 100644
--- a/rpb-openembedded/lava-job-definitions/qemuarm64/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/qemuarm64/template-boot.yaml
@@ -67,9 +67,9 @@ actions:
       login_commands:
         - sudo -s
     prompts:
-    - root@(.*):~#
-    - ledge@(.*):~#
-    - 'ledge.*$'
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
 
 metadata:
   machine: ${MACHINE}
diff --git a/rpb-openembedded/lava-job-definitions/qemuarm64_atf_fip/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemuarm64_atf_fip/template-boot.yaml
index af6c73ed76..7d39b99f1b 100644
--- a/rpb-openembedded/lava-job-definitions/qemuarm64_atf_fip/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/qemuarm64_atf_fip/template-boot.yaml
@@ -57,11 +57,9 @@ actions:
       login_commands:
       - sudo -s
     prompts:
-    - root@(.*):~#
-    - ledge@(.*):~#
-    - '~ #'
-    - 'ledge.*$$'
-
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
 metadata:
   machine: ${MACHINE}
   manifest branch: ${MANIFEST_BRANCH}
diff --git a/rpb-openembedded/lava-job-definitions/qemuarm64uefi/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemuarm64uefi/template-boot.yaml
index 4a2822a57e..713aadc6bc 100644
--- a/rpb-openembedded/lava-job-definitions/qemuarm64uefi/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/qemuarm64uefi/template-boot.yaml
@@ -62,10 +62,9 @@ actions:
       login_commands:
         - sudo -s
     prompts:
-    - root@(.*):~#
-    - ledge@(.*):~#
-    - '~ #'
-    - 'ledge.*$$'
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
 
 metadata:
   machine: ${MACHINE}
diff --git a/rpb-openembedded/lava-job-definitions/qemuarmuefi/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemuarmuefi/template-boot.yaml
index 9085153101..407f0322bf 100644
--- a/rpb-openembedded/lava-job-definitions/qemuarmuefi/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/qemuarmuefi/template-boot.yaml
@@ -62,10 +62,9 @@ actions:
       login_commands:
         - sudo -s
     prompts:
-    - root@(.*):~#
-    - ledge@(.*):~#
-    - '~ #'
-    - 'ledge.*$$'
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
 
 metadata:
   machine: ${MACHINE}
diff --git a/rpb-openembedded/lava-job-definitions/qemux86_64uefi/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemux86_64uefi/template-boot.yaml
index 89777f3cfc..b4caffd683 100644
--- a/rpb-openembedded/lava-job-definitions/qemux86_64uefi/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/qemux86_64uefi/template-boot.yaml
@@ -61,9 +61,9 @@ actions:
       login_commands:
         - sudo -s
     prompts:
-    - root@(.*):~#
-    - ledge@(.*):~#
-    - '~ #'
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
 
 metadata:
   machine: ${MACHINE}
diff --git a/rpb-openembedded/lava-job-definitions/stm32mp157c-dk2/template-boot.yaml b/rpb-openembedded/lava-job-definitions/stm32mp157c-dk2/template-boot.yaml
index e8515b62cd..a7b5c0862b 100644
--- a/rpb-openembedded/lava-job-definitions/stm32mp157c-dk2/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/stm32mp157c-dk2/template-boot.yaml
@@ -39,10 +39,12 @@ actions:
       login_commands:
       - sudo -s
     prompts:
-    - 'ledge@(.*):~#'
     - 'ledge@debian:~#'
     - '/ #'
-    - 'ledge.*$$'
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
+
     transfer_overlay:
       download_command: udhcpc -i eth0; cd /tmp ; wget
       unpack_command: tar -C / -xzf
diff --git a/rpb-openembedded/lava-job-definitions/synquacer/template-boot.yaml b/rpb-openembedded/lava-job-definitions/synquacer/template-boot.yaml
index a35596f7fc..a139857cb9 100644
--- a/rpb-openembedded/lava-job-definitions/synquacer/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/synquacer/template-boot.yaml
@@ -62,8 +62,9 @@ actions:
     - clear
     - boot
     prompts:
-    - root@(.*)
-    - '~ #'
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
 
 metadata:
   machine: ${MACHINE}
diff --git a/rpb-openembedded/lava-job-definitions/x15-bl_uefi/template-boot.yaml b/rpb-openembedded/lava-job-definitions/x15-bl_uefi/template-boot.yaml
index d7fa0208af..25d986884f 100644
--- a/rpb-openembedded/lava-job-definitions/x15-bl_uefi/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/x15-bl_uefi/template-boot.yaml
@@ -51,10 +51,9 @@ actions:
     - 'root@debian:~#'
     - '/ #'
     - 'root@ledge-ti-am572x:~#'
-    - root@(.*):~#
-    - ledge@(.*):~#
-    - '~ #'
-    - 'ledge.*$$'
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
 
 metadata:
   machine: ${MACHINE}