android hikey-v2: extract the media tests from cts-part5

split the media related modules out from cts-part5
test plan, and create a new cts-media2 with them.

also exclude following 2 test cases:
    com.android.server.cts.BatteryStatsValidationTest#testSyncBgVsFg
    com.android.server.cts.BatteryStatsValidationTest#testWifiScans
from CtsIncidentHostTestCases module in cts-part5 plan,
since they will cause shell unresponsive problems and block the test to finish

Change-Id: Iafd7beeef962fbfec400b95cb1e47c09e6de8e81
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
diff --git a/android/hikey-v2/template-cts-media2-v7a.yaml b/android/hikey-v2/template-cts-media2-v7a.yaml
new file mode 100644
index 0000000..a34ed90
--- /dev/null
+++ b/android/hikey-v2/template-cts-media2-v7a.yaml
@@ -0,0 +1,120 @@
+job_name: "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-cts-media2-v7a"
+timeouts:
+  job:
+    minutes: 600
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: medium
+visibility: public
+
+metadata:
+  android.build: "%%ANDROID_META_BUILD%%"
+  android.name: "%%ANDROID_META_NAME%%"
+  android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    template: ubuntu
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 5
+    to: lxc
+    packages:
+    - wget
+    - zip
+    - unzip
+    os: ubuntu
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
+- deploy:
+    timeout:
+      minutes: 30
+    to: fastboot
+    namespace: droid
+    connection: lxc
+    images:
+      ptable:
+        reboot: hard-reset
+        url: http://releases.linaro.org/reference-platform/enterprise/16.12/uefi/release/hikey/ptable-aosp-8g.img
+      boot:
+        reboot: hard-reset
+        url: "%%DOWNLOAD_URL%%/boot.img.xz"
+        compression: xz
+      cache:
+        url: "%%ANDROID_CACHE%%"
+        compression: xz
+      userdata:
+        url: "%%ANDROID_DATA%%"
+        compression: xz
+      system:
+        url: "%%ANDROID_SYSTEM%%"
+        compression: xz
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+            minutes: 2
+
+- boot:
+    namespace: droid
+    connection: serial
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    connection: lxc
+    timeout:
+      minutes: 600
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "run cts-media2 --abi armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+      name: cts-part5-v7a
diff --git a/android/hikey-v2/template-cts-media2-v8a.yaml b/android/hikey-v2/template-cts-media2-v8a.yaml
new file mode 100644
index 0000000..b6d9cf0
--- /dev/null
+++ b/android/hikey-v2/template-cts-media2-v8a.yaml
@@ -0,0 +1,121 @@
+device_type: hi6220-hikey
+job_name: "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-cts-media2-v8a"
+timeouts:
+  job:
+    minutes: 600
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: medium
+visibility: public
+
+metadata:
+  android.build: "%%ANDROID_META_BUILD%%"
+  android.name: "%%ANDROID_META_NAME%%"
+  android.url: "%%ANDROID_META_URL%%"
+  android.fastboot: "platform-tools_r26.0.0"
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    template: ubuntu
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 5
+    to: lxc
+    packages:
+    - wget
+    - zip
+    - unzip
+    os: ubuntu
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      name: install-google-fastboot
+      path: inline/install-google-fastboot.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: install-fastboot
+          description: "Install fastboot provided by google"
+        run:
+          steps:
+          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
+          - unzip platform-tools_r26.0.0-linux.zip
+          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
+          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
+          - fastboot --version
+
+- deploy:
+    timeout:
+      minutes: 30
+    to: fastboot
+    namespace: droid
+    connection: lxc
+    images:
+      ptable:
+        reboot: hard-reset
+        url: http://releases.linaro.org/reference-platform/enterprise/16.12/uefi/release/hikey/ptable-aosp-8g.img
+      boot:
+        reboot: hard-reset
+        url: "%%DOWNLOAD_URL%%/boot.img.xz"
+        compression: xz
+      cache:
+        url: "%%ANDROID_CACHE%%"
+        compression: xz
+      userdata:
+        url: "%%ANDROID_DATA%%"
+        compression: xz
+      system:
+        url: "%%ANDROID_SYSTEM%%"
+        compression: xz
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+            minutes: 2
+
+- boot:
+    namespace: droid
+    connection: serial
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    connection: lxc
+    timeout:
+      minutes: 600
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "run cts-media2 --abi arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.0_r1.zip"
+      name: cts-part5-v8a
diff --git a/android/hikey-v2/template-cts-part5-v7a.yaml b/android/hikey-v2/template-cts-part5-v7a.yaml
index 206431e..857928b 100644
--- a/android/hikey-v2/template-cts-part5-v7a.yaml
+++ b/android/hikey-v2/template-cts-part5-v7a.yaml
@@ -2,7 +2,7 @@
 job_name: "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-cts-part5-v7a"
 timeouts:
   job:
-    minutes: 600
+    minutes: 240
   action:
     minutes: 15
   connection:
@@ -110,7 +110,7 @@
     namespace: tlxc
     connection: lxc
     timeout:
-      minutes: 600
+      minutes: 240
     definitions:
     - repository: https://git.linaro.org/qa/test-definitions.git
       from: git
diff --git a/android/hikey-v2/template-cts-part5-v8a.yaml b/android/hikey-v2/template-cts-part5-v8a.yaml
index 2c0b867..13cbafa 100644
--- a/android/hikey-v2/template-cts-part5-v8a.yaml
+++ b/android/hikey-v2/template-cts-part5-v8a.yaml
@@ -2,7 +2,7 @@
 job_name: "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-cts-part5-v8a"
 timeouts:
   job:
-    minutes: 600
+    minutes: 240
   action:
     minutes: 15
   connection:
@@ -110,7 +110,7 @@
     namespace: tlxc
     connection: lxc
     timeout:
-      minutes: 600
+      minutes: 240
     definitions:
     - repository: https://git.linaro.org/qa/test-definitions.git
       from: git