hikey-v2 jobs: add support for master build

the master build boot prompt is changed to 'console:/' now
like the build here:
https://validation.linaro.org/scheduler/job/1651194#L3873

Change-Id: I469a5bc052d142cace251351bff90a194babfc73
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
diff --git a/android/hikey-v2/template-andebenchpro2015.yaml b/android/hikey-v2/template-andebenchpro2015.yaml
index 5cd18b3..5f058b7 100644
--- a/android/hikey-v2/template-andebenchpro2015.yaml
+++ b/android/hikey-v2/template-andebenchpro2015.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-antutu6.yaml b/android/hikey-v2/template-antutu6.yaml
index ea31667..3d9fea4 100644
--- a/android/hikey-v2/template-antutu6.yaml
+++ b/android/hikey-v2/template-antutu6.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-benchmarkpi.yaml b/android/hikey-v2/template-benchmarkpi.yaml
index 215e707..0eeaaad 100644
--- a/android/hikey-v2/template-benchmarkpi.yaml
+++ b/android/hikey-v2/template-benchmarkpi.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-boottime.yaml b/android/hikey-v2/template-boottime.yaml
index aaf7e12..2047493 100644
--- a/android/hikey-v2/template-boottime.yaml
+++ b/android/hikey-v2/template-boottime.yaml
@@ -41,6 +41,8 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +104,7 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
     - ':/'
     timeout:
       minutes: 15
@@ -134,6 +137,7 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
     - ':/'
     timeout:
       minutes: 15
@@ -159,6 +163,7 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
     - ':/'
     timeout:
       minutes: 15
@@ -184,6 +189,7 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
     - ':/'
     timeout:
       minutes: 15
@@ -209,6 +215,7 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
     - ':/'
     timeout:
       minutes: 15
@@ -234,6 +241,7 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
     - ':/'
     timeout:
       minutes: 15
@@ -259,6 +267,7 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
     - ':/'
     timeout:
       minutes: 15
@@ -284,6 +293,7 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
     - ':/'
     timeout:
       minutes: 15
@@ -309,6 +319,7 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
     - ':/'
     timeout:
       minutes: 15
@@ -341,6 +352,7 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
     - ':/'
     timeout:
       minutes: 15
diff --git a/android/hikey-v2/template-caffeinemark.yaml b/android/hikey-v2/template-caffeinemark.yaml
index 4ea9c01..fec2e77 100644
--- a/android/hikey-v2/template-caffeinemark.yaml
+++ b/android/hikey-v2/template-caffeinemark.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cf-bench.yaml b/android/hikey-v2/template-cf-bench.yaml
index 9db376b..445a29e 100644
--- a/android/hikey-v2/template-cf-bench.yaml
+++ b/android/hikey-v2/template-cf-bench.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-focused1-v7a.yaml b/android/hikey-v2/template-cts-focused1-v7a.yaml
index c95f2b1..78c6045 100644
--- a/android/hikey-v2/template-cts-focused1-v7a.yaml
+++ b/android/hikey-v2/template-cts-focused1-v7a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-focused1-v8a.yaml b/android/hikey-v2/template-cts-focused1-v8a.yaml
index 004bd73..74516a1 100644
--- a/android/hikey-v2/template-cts-focused1-v8a.yaml
+++ b/android/hikey-v2/template-cts-focused1-v8a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-focused2-v7a.yaml b/android/hikey-v2/template-cts-focused2-v7a.yaml
index 352bbef..40a68cd 100644
--- a/android/hikey-v2/template-cts-focused2-v7a.yaml
+++ b/android/hikey-v2/template-cts-focused2-v7a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-focused2-v8a.yaml b/android/hikey-v2/template-cts-focused2-v8a.yaml
index 35dbac1..8be2c06 100644
--- a/android/hikey-v2/template-cts-focused2-v8a.yaml
+++ b/android/hikey-v2/template-cts-focused2-v8a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-media-v7a.yaml b/android/hikey-v2/template-cts-media-v7a.yaml
index d9f940d..03f8aac 100644
--- a/android/hikey-v2/template-cts-media-v7a.yaml
+++ b/android/hikey-v2/template-cts-media-v7a.yaml
@@ -43,6 +43,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -104,6 +107,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-media-v8a.yaml b/android/hikey-v2/template-cts-media-v8a.yaml
index aef2f77..a31ddd9 100644
--- a/android/hikey-v2/template-cts-media-v8a.yaml
+++ b/android/hikey-v2/template-cts-media-v8a.yaml
@@ -43,6 +43,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -104,6 +107,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-media2-v7a.yaml b/android/hikey-v2/template-cts-media2-v7a.yaml
index 0519715..8101b3c 100644
--- a/android/hikey-v2/template-cts-media2-v7a.yaml
+++ b/android/hikey-v2/template-cts-media2-v7a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-media2-v8a.yaml b/android/hikey-v2/template-cts-media2-v8a.yaml
index 8000bc4..a138317 100644
--- a/android/hikey-v2/template-cts-media2-v8a.yaml
+++ b/android/hikey-v2/template-cts-media2-v8a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-opengl-v7a.yaml b/android/hikey-v2/template-cts-opengl-v7a.yaml
index 1e70da9..8f19fb8 100644
--- a/android/hikey-v2/template-cts-opengl-v7a.yaml
+++ b/android/hikey-v2/template-cts-opengl-v7a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-opengl-v8a.yaml b/android/hikey-v2/template-cts-opengl-v8a.yaml
index 527a338..a0d7310 100644
--- a/android/hikey-v2/template-cts-opengl-v8a.yaml
+++ b/android/hikey-v2/template-cts-opengl-v8a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-part1-v7a.yaml b/android/hikey-v2/template-cts-part1-v7a.yaml
index 450a177..e2f394b 100644
--- a/android/hikey-v2/template-cts-part1-v7a.yaml
+++ b/android/hikey-v2/template-cts-part1-v7a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-part1-v8a.yaml b/android/hikey-v2/template-cts-part1-v8a.yaml
index cb1c58c..92f5efc 100644
--- a/android/hikey-v2/template-cts-part1-v8a.yaml
+++ b/android/hikey-v2/template-cts-part1-v8a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-part2-v7a.yaml b/android/hikey-v2/template-cts-part2-v7a.yaml
index b9ac81e..896f946 100644
--- a/android/hikey-v2/template-cts-part2-v7a.yaml
+++ b/android/hikey-v2/template-cts-part2-v7a.yaml
@@ -43,6 +43,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -104,6 +107,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-part2-v8a.yaml b/android/hikey-v2/template-cts-part2-v8a.yaml
index 9a91f4c..1f3ef4d 100644
--- a/android/hikey-v2/template-cts-part2-v8a.yaml
+++ b/android/hikey-v2/template-cts-part2-v8a.yaml
@@ -43,6 +43,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -104,6 +107,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-part3-v7a.yaml b/android/hikey-v2/template-cts-part3-v7a.yaml
index 37beefd..1379808 100644
--- a/android/hikey-v2/template-cts-part3-v7a.yaml
+++ b/android/hikey-v2/template-cts-part3-v7a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-part3-v8a.yaml b/android/hikey-v2/template-cts-part3-v8a.yaml
index e8c99fc..74d8e28 100644
--- a/android/hikey-v2/template-cts-part3-v8a.yaml
+++ b/android/hikey-v2/template-cts-part3-v8a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-part4-v7a.yaml b/android/hikey-v2/template-cts-part4-v7a.yaml
index a619b33..60ef5da 100644
--- a/android/hikey-v2/template-cts-part4-v7a.yaml
+++ b/android/hikey-v2/template-cts-part4-v7a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-part4-v8a.yaml b/android/hikey-v2/template-cts-part4-v8a.yaml
index 8c5fa3a..b32cadd 100644
--- a/android/hikey-v2/template-cts-part4-v8a.yaml
+++ b/android/hikey-v2/template-cts-part4-v8a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-part5-v7a.yaml b/android/hikey-v2/template-cts-part5-v7a.yaml
index dc736a0..571da79 100644
--- a/android/hikey-v2/template-cts-part5-v7a.yaml
+++ b/android/hikey-v2/template-cts-part5-v7a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-cts-part5-v8a.yaml b/android/hikey-v2/template-cts-part5-v8a.yaml
index f649ee6..42a7936 100644
--- a/android/hikey-v2/template-cts-part5-v8a.yaml
+++ b/android/hikey-v2/template-cts-part5-v8a.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-gearses2eclair.yaml b/android/hikey-v2/template-gearses2eclair.yaml
index 3e6ef7f..5562712 100644
--- a/android/hikey-v2/template-gearses2eclair.yaml
+++ b/android/hikey-v2/template-gearses2eclair.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-geekbench3.yaml b/android/hikey-v2/template-geekbench3.yaml
index 651c45c..4088be5 100644
--- a/android/hikey-v2/template-geekbench3.yaml
+++ b/android/hikey-v2/template-geekbench3.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-glbenchmark25.yaml b/android/hikey-v2/template-glbenchmark25.yaml
index c85f1be..18640fb 100644
--- a/android/hikey-v2/template-glbenchmark25.yaml
+++ b/android/hikey-v2/template-glbenchmark25.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-javawhetstone.yaml b/android/hikey-v2/template-javawhetstone.yaml
index 9592e6c..1723ea5 100644
--- a/android/hikey-v2/template-javawhetstone.yaml
+++ b/android/hikey-v2/template-javawhetstone.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-jbench.yaml b/android/hikey-v2/template-jbench.yaml
index f37182f..affb3b8 100644
--- a/android/hikey-v2/template-jbench.yaml
+++ b/android/hikey-v2/template-jbench.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-linpack.yaml b/android/hikey-v2/template-linpack.yaml
index a9babc7..aa7d63c 100644
--- a/android/hikey-v2/template-linpack.yaml
+++ b/android/hikey-v2/template-linpack.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-quadrantpro.yaml b/android/hikey-v2/template-quadrantpro.yaml
index 3e81a42..ac4fdc3 100644
--- a/android/hikey-v2/template-quadrantpro.yaml
+++ b/android/hikey-v2/template-quadrantpro.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-rl-sqlite.yaml b/android/hikey-v2/template-rl-sqlite.yaml
index fc3a1dd..5c2e2f3 100644
--- a/android/hikey-v2/template-rl-sqlite.yaml
+++ b/android/hikey-v2/template-rl-sqlite.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-scimark.yaml b/android/hikey-v2/template-scimark.yaml
index 3e29437..33791c3 100644
--- a/android/hikey-v2/template-scimark.yaml
+++ b/android/hikey-v2/template-scimark.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-vellamo3.yaml b/android/hikey-v2/template-vellamo3.yaml
index 2905e16..69a4b67 100644
--- a/android/hikey-v2/template-vellamo3.yaml
+++ b/android/hikey-v2/template-vellamo3.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-vts-part1.yaml b/android/hikey-v2/template-vts-part1.yaml
index 0733b44..b4c3568 100644
--- a/android/hikey-v2/template-vts-part1.yaml
+++ b/android/hikey-v2/template-vts-part1.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-vts-part2.yaml b/android/hikey-v2/template-vts-part2.yaml
index 486bd1d..de59409 100644
--- a/android/hikey-v2/template-vts-part2.yaml
+++ b/android/hikey-v2/template-vts-part2.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-vts-part3.yaml b/android/hikey-v2/template-vts-part3.yaml
index 18e86b2..caa8722 100644
--- a/android/hikey-v2/template-vts-part3.yaml
+++ b/android/hikey-v2/template-vts-part3.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-vts-part4.yaml b/android/hikey-v2/template-vts-part4.yaml
index 17fe83d..feb6d12 100644
--- a/android/hikey-v2/template-vts-part4.yaml
+++ b/android/hikey-v2/template-vts-part4.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-vts-part5.yaml b/android/hikey-v2/template-vts-part5.yaml
index 8f544ac..9096a5d 100644
--- a/android/hikey-v2/template-vts-part5.yaml
+++ b/android/hikey-v2/template-vts-part5.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-vts-part6.yaml b/android/hikey-v2/template-vts-part6.yaml
index 7f330f7..9e6409d 100644
--- a/android/hikey-v2/template-vts-part6.yaml
+++ b/android/hikey-v2/template-vts-part6.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-weekly.yaml b/android/hikey-v2/template-weekly.yaml
index acf0cbb..e63ff8d 100644
--- a/android/hikey-v2/template-weekly.yaml
+++ b/android/hikey-v2/template-weekly.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template-xtest-lmg.yaml b/android/hikey-v2/template-xtest-lmg.yaml
index 38ff914..61300fc 100644
--- a/android/hikey-v2/template-xtest-lmg.yaml
+++ b/android/hikey-v2/template-xtest-lmg.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
diff --git a/android/hikey-v2/template.yaml b/android/hikey-v2/template.yaml
index 1d36bf2..9c7237f 100644
--- a/android/hikey-v2/template.yaml
+++ b/android/hikey-v2/template.yaml
@@ -41,6 +41,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 5
     method: lxc
@@ -102,6 +105,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot
@@ -139,6 +145,9 @@
     prompts:
     - 'root@(.*):/#'
     - 'hikey:/'
+    - 'console:/'
+    - ':/'
+
     timeout:
       minutes: 15
     method: fastboot