lkft android: add lkft builds for hikey960

and change the original hikey build to the new build framework

Change-Id: I749c092d1c14cd8ec771165037e9907456d98fe6
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

2 files changed, 60 insertions, 1 deletions

diff --git a/lkft/lava-job-definitions/common/devices/hikey960 b/lkft/lava-job-definitions/common/devices/hikey960
new file mode 100644
index 00000000..a9765680
--- /dev/null
+++ b/lkft/lava-job-definitions/common/devices/hikey960
@@ -0,0 +1,55 @@
+{% extends "template-lkft.yaml" %}
+
+{% block device_type %}hi960-hikey{% endblock %}
+
+{% block secrets %}
+  {{ super() }}
+  AP_SSID: "{{AP_SSID}}"
+  AP_KEY: "{{AP_KEY}}"
+{% endblock %}
+
+{% block deploy_target %}
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      boot:
+        reboot: hard-reset
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      dts:
+        url: {{DOWNLOAD_URL}}/dt.img
+      userdata:
+        url: {{REFERENCE_BUILD_URL}}/userdata.img.xz
+        compression: xz
+      system:
+        url: {{REFERENCE_BUILD_URL}}/system.img.xz
+        compression: xz
+      vendor:
+        url: {{DOWNLOAD_URL}}/vendor.img.xz
+        compression: xz
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+{% endblock deploy_target %}
+
+{% block boot_target %}
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    - 'console:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/submit_for_testing-v2.sh b/lkft/lava-job-definitions/common/submit_for_testing-v2.sh
index 248cf3b3..d20cf80e 100755
--- a/lkft/lava-job-definitions/common/submit_for_testing-v2.sh
+++ b/lkft/lava-job-definitions/common/submit_for_testing-v2.sh
@@ -59,13 +59,17 @@ function submit_jobs_for_config(){
         # replace file name in job template with new file name generated
         sed -i "s|{{DOWNLOAD_URL}}/${f}|{{DOWNLOAD_URL}}/${build_config}-$f|" ${DIR_CONFIGS_ROOT}/lkft/lava-job-definitions/common/devices/${TEST_DEVICE_TYPE}
     done
+    OPT_ENV_SUFFIX=""
+    if [ -z "{TEST_QA_SERVER_ENV_SUFFIX}" ] && [ "X${TEST_QA_SERVER_ENV_SUFFIX_ENABLED}" == "Xtrue" ]; then
+        OPT_ENV_SUFFIX="--env-suffix ${TEST_QA_SERVER_ENV_SUFFIX}"
+    fi
     python ${DIR_CONFIGS_ROOT}/openembedded-lkft/submit_for_testing.py \
         --device-type ${TEST_DEVICE_TYPE} \
         --build-number ${BUILD_NUMBER} \
         --lava-server ${TEST_LAVA_SERVER} \
         --qa-server ${TEST_QA_SERVER} \
         --qa-server-team android-lkft \
-        --env-suffix "_4.19" \
+        ${OPT_ENV_SUFFIX} \
         --qa-server-project ${TEST_QA_SERVER_PROJECT} \
         --git-commit ${QA_BUILD_VERSION} \
         --testplan-path ${DIR_CONFIGS_ROOT}/lkft/lava-job-definitions/common \