android boottime: update to collect the first boot time info

Change-Id: I2f11bbb3f6f61831b251c68c322c85d46238494b
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
diff --git a/android/hikey-v2/template-boottime.yaml b/android/hikey-v2/template-boottime.yaml
index 2209084..aaf7e12 100644
--- a/android/hikey-v2/template-boottime.yaml
+++ b/android/hikey-v2/template-boottime.yaml
@@ -116,10 +116,17 @@
         - repository: https://git.linaro.org/qa/test-definitions.git
           from: git
           path: automated/android/boottime/boottime.yaml
-          name: first-boot-ignored
+          name: first-boot
           params:
             OPERATION: COLLECT
             COLLECT_NO: "0"
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-first-analyze
+          params:
+            OPERATION: ANALYZE
+            COLLECT_NO: "0"
 
 - boot:
     namespace: droid
@@ -316,7 +323,7 @@
         - repository: https://git.linaro.org/qa/test-definitions.git
           from: git
           path: automated/android/boottime/boottime.yaml
-          name: boottime-analyze
+          name: boottime-second-analyze
           params:
             OPERATION: ANALYZE
             COLLECT_NO: 7
diff --git a/android/x15-v2/template-boottime.yaml b/android/x15-v2/template-boottime.yaml
index 5bf7aa6..c17354c 100644
--- a/android/x15-v2/template-boottime.yaml
+++ b/android/x15-v2/template-boottime.yaml
@@ -102,17 +102,20 @@
     timeout:
       minutes: 10
     definitions:
-    - from: inline
-      name: skip-first-boot
-      path: inline/skip-first-boot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: skip-first-boot
-          description: "Skip the first boot at the moment, and this depends on disablesuspend.sh. We might collect the first boot information in the future"
-        run:
-          steps:
-          - disablesuspend.sh
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: first-boot
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: "0"
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-first-analyze
+          params:
+            OPERATION: ANALYZE
+            COLLECT_NO: "0"
 
 - boot:
     namespace: droid
@@ -301,7 +304,7 @@
         - repository: https://git.linaro.org/qa/test-definitions.git
           from: git
           path: automated/android/boottime/boottime.yaml
-          name: boottime-analyze
+          name: boottime-second-analyze
           params:
             OPERATION: ANALYZE
             COLLECT_NO: 7