96boards-hikey-aosp-master: fix job submission

Boot test job is failing because of invalid URLs. Refer to:
https://lkft.validation.linaro.org/scheduler/job/1717

For image URL replacing, LKFT uses 'REFERENCE_BUILD_URL/IMAGE_NAME',
while aosp-master uses 'ANDROID_IMAGE_NAME'. Sharing templates between
them probably is a bad idea. This patch uses separate test templates for
aosp-master to reduce complexity.

Change-Id: I458db125bf252447231e027b0f7d4fd9e85d9fd5
Signed-off-by: Chase Qi <chase.qi@linaro.org>

2 files changed, 195 insertions, 0 deletions

diff --git a/96boards-hikey/lava-job-definitions/hi6220-hikey/aosp-master/template-boot.yaml b/96boards-hikey/lava-job-definitions/hi6220-hikey/aosp-master/template-boot.yaml
new file mode 100644
index 0000000000..d798abf25c
--- /dev/null
+++ b/96boards-hikey/lava-job-definitions/hi6220-hikey/aosp-master/template-boot.yaml
@@ -0,0 +1,93 @@
+device_type: hi6220-hikey
+job_name: "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-basic"
+
+tags:
+- aosp-only
+
+timeouts:
+  job:
+    minutes: 120
+  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%%"
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 5
+    to: lxc
+    packages:
+    - android-tools-adb
+    - android-tools-fastboot
+    - systemd
+    - systemd-sysv
+    - ca-certificates
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- deploy:
+    timeout:
+      minutes: 30
+    to: fastboot
+    namespace: droid
+    images:
+      ptable:
+        url: http://builds.96boards.org/snapshots/reference-platform/components/uefi/latest/release/hikey/ptable-aosp-8g.img
+      boot:
+        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
+    os: debian
+
+- boot:
+    namespace: droid
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      connection: lxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-test
diff --git a/96boards-hikey/lava-job-definitions/hi6220-hikey/aosp-master/template-cts.yaml b/96boards-hikey/lava-job-definitions/hi6220-hikey/aosp-master/template-cts.yaml
new file mode 100644
index 0000000000..0b25b8e41a
--- /dev/null
+++ b/96boards-hikey/lava-job-definitions/hi6220-hikey/aosp-master/template-cts.yaml
@@ -0,0 +1,102 @@
+device_type: hi6220-hikey
+tags:
+  - aosp-only
+job_name: "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-%%CTS_MODULE_NAME%%"
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: medium
+visibility:
+  group:
+    - lkft
+
+secrets:
+  ARTIFACTORIAL_TOKEN: "%%ARTIFACTORIAL_TOKEN%%"
+
+metadata:
+  android.build: "%%ANDROID_META_BUILD%%"
+  android.name: "%%ANDROID_META_NAME%%"
+  android.url: "%%ANDROID_META_URL%%"
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 5
+    to: lxc
+    packages:
+    - android-tools-adb
+    - android-tools-fastboot
+    - systemd
+    - systemd-sysv
+    - ca-certificates
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- deploy:
+    timeout:
+      minutes: 30
+    to: fastboot
+    namespace: droid
+    connection: lxc
+    images:
+      ptable:
+        url: http://builds.96boards.org/snapshots/reference-platform/components/uefi/latest/release/hikey/ptable-aosp-8g.img
+      boot:
+        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
+    os: debian
+
+- boot:
+    namespace: droid
+    connection: serial
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    connection: lxc
+    timeout:
+      minutes: 300
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "run cts --include-filter %%CTS_MODULE_NAME%% --disable-reboot --skip-preconditions --skip-device-info"
+        TEST_URL: "http://snapshots.linaro.org/android/android-cts/hikey-userdebug/1/android-cts.zip"
+        TEST_PATH: "android-cts"
+      name: "%%CTS_MODULE_NAME%%"