android-lcr: switch test job submission to qa-reports

This patch has 2 purposes:
 - simplify test job templates and remove duplication
 - switch test job submissions to lkft

In order to simplify test job templating, exising jinja2 engine was used
similarly to openembedded-lkft projects. This move separates device
deployment from test plan and minimizes code duplication.

Job submissions are moved to qa-reports using common
submit-for-testing.py from openembedded-lkft.

Change-Id: I14b71652d5d6abca024399f5849e55d10cc1623d
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>

58 files changed, 880 insertions, 62 deletions

diff --git a/android-lcr/common/submit_for_testing.sh b/android-lcr/common/submit_for_testing.sh
new file mode 100755
index 0000000000..dcf1f861ca
--- /dev/null
+++ b/android-lcr/common/submit_for_testing.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+#set -ex
+
+[ -z "${LAVA_JOB_PRIORITY}" ] && export LAVA_JOB_PRIORITY="low"
+[ -z "${SKIP_LAVA}" ] || unset DEVICE_TYPE
+
+if [ -n "${DRY_RUN}" ]; then
+    export DRY_RUN="--dry-run --template-path ../lava-job-definitions --testplan-path ../lava-job-definitions/ --quiet"
+    export BASE_PATH=../
+    export SCRIPT_PATH=../../openembedded-lkft/
+else
+    export DRY_RUN=""
+    export BASE_PATH=configs/android-lcr/
+    export SCRIPT_PATH=configs/openembedded-lkft/
+fi
+
+if [ -z "${DEVICE_TYPE}" ]; then
+    echo "DEVICE_TYPE not set. Exiting"
+    exit 0
+fi
+
+# create env variables as in post-build-lava
+export SNAPSHOTS_URL=https://snapshots.linaro.org
+export FILE_EXTENSION=tar.bz2
+if [ "${MAKE_TARGETS}" = "droidcore" ]; then
+    if [ -z "$IMAGE_EXTENSION" ]; then
+        export FILE_EXTENSION=${IMAGE_EXTENSION}
+    else
+        export FILE_EXTENSION=img
+    fi
+fi
+if [ -z "${FRONTEND_JOB_NAME}" ]; then
+    export FRONTEND_JOB_NAME=~$(echo ${JOB_NAME} | sed -e 's/_/\//')
+fi
+if [ -z "${DOWNLOAD_URL}" ]; then
+    export DOWNLOAD_URL=${SNAPSHOTS_URL}/android/${FRONTEND_JOB_NAME}/${BUILD_NUMBER}
+fi
+export ANDROID_BOOT=${DOWNLOAD_URL}/boot.${FILE_EXTENSION}
+export ANDROID_SYSTEM=${DOWNLOAD_URL}/system.${FILE_EXTENSION}
+export ANDROID_DATA=${DOWNLOAD_URL}/userdata.${FILE_EXTENSION}
+export ANDROID_CACHE=${DOWNLOAD_URL}/cache.${FILE_EXTENSION}
+export ANDROID_META_NAME=${JOB_NAME}
+export ANDROID_META_BUILD=${BUILD_NUMBER}
+export ANDROID_META_URL=${BUILD_URL}
+export WA2_JOB_NAME=${BUILD_NUMBER}
+[ -z "${GERRIT_CHANGE_NUMBER}" ] && export GERRIT_CHANGE_NUMBER=""
+[ -z "${GERRIT_PATCHSET_NUMBER}" ] && export GERRIT_PATCHSET_NUMBER=""
+[ -z "${GERRIT_CHANGE_URL}" ] && export GERRIT_CHANGE_URL=""
+[ -z "${GERRIT_CHANGE_ID}" ] && export GERRIT_CHANGE_ID=""
+[ -z "${REFERENCE_BUILD_URL}" ] && export REFERENCE_BUILD_URL=""
+[ -z "${CTS_MODULE_NAME}" ] && export CTS_MODULE_NAME=""
+
+if [ -z "${DRY_RUN}" ]; then
+    rm -rf configs
+    git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+fi
+
+[ ! -z ${TEST_TEMPLATES} ] && unset TEST_TEMPLATES
+TEMPLATE_PATH=""
+
+for test in $(ls ${BASE_PATH}/lava-job-definitions/testplan/); do
+    TEST_TEMPLATES="${TEST_TEMPLATES} testplan/${test}"
+done
+
+python ${SCRIPT_PATH}/submit_for_testing.py \
+  --device-type ${DEVICE_TYPE} \
+  --env-suffix ${FRONTEND_JOB_NAME} \
+  --build-number ${BUILD_NUMBER} \
+  --lava-server ${LAVA_SERVER} \
+  --qa-server ${QA_SERVER} \
+  --qa-server-team lmg \
+  --qa-server-project ${QA_SERVER_PROJECT} \
+  --git-commit ${BUILD_NUMBER} \
+  ${DRY_RUN} \
+  --test-plan ${TEST_TEMPLATES}
diff --git a/android-lcr/common/test_submit_for_testing.sh b/android-lcr/common/test_submit_for_testing.sh
new file mode 100755
index 0000000000..5eb2ccc069
--- /dev/null
+++ b/android-lcr/common/test_submit_for_testing.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+virtualenv .venv
+source .venv/bin/activate
+pip install Jinja2 requests urllib3 ruamel.yaml
+
+export ART_URL=https://android-qa-reports.linaro.org/api/
+export BUILD_DIR=r-lcr-oreo
+export BUILD_DISPLAY_NAME=#38
+export BUILD_ID=38
+export BUILD_NUMBER=38
+export GERRIT_BRANCH=master
+export GERRIT_CHANGE_COMMIT_MESSAGE=dXBkYXRlIHRvIHRhZyBhbmRyb2lkLTguMS4wX3IyCgpUaGUgY2hhbmdlIGxvZyBjb3VsZCBiZSBjaGVja2VkIGhlcmU6IGh0dHA6Ly9wZW9wbGUubGluYXJvLm9yZy9+eW9uZ3Fpbi5saXUvQ2hhbmdlTG9ncy9DaGFuZ2VMb2ctYW5kcm9pZC04LjEuMF9yMS1hbmRyb2lkLTguMS4wX3IyLTIwMTctMTItMTgtMDMtMzAtMzEudHh0CgpDaGFuZ2UtSWQ6IEkxMTAzZTdlMzJkMzBiOWNhZjY3NjM4NTk4NzVjYjYxNGE5OTRmODY4ClNpZ25lZC1vZmYtYnk6IFlvbmdxaW4gTGl1IDx5b25ncWluLmxpdUBsaW5hcm8ub3JnPgo=
+export GERRIT_CHANGE_ID=I1103e7e32d30b9caf6763859875cb614a994f868
+export GERRIT_CHANGE_NUMBER=18010
+export GERRIT_CHANGE_SUBJECT=android-8.1.0_r2
+export GERRIT_CHANGE_URL=http://android-review.linaro.org/18010
+export GERRIT_EVENT_HASH=1581147094
+export GERRIT_EVENT_TYPE=change-merged
+export GERRIT_HOST=android-review.linaro.org
+export GERRIT_NAME=android-review.linaro.org
+export GERRIT_NEWREV=ded592ed8683143217b56c3915d00eef1d5abb12
+export GERRIT_PATCHSET_NUMBER=1
+export GERRIT_PATCHSET_REVISION=ded592ed8683143217b56c3915d00eef1d5abb12
+export GERRIT_PORT=29418
+export GERRIT_PROJECT=android-build-configs
+export GERRIT_REFSPEC=refs/changes/10/18010/1
+export GERRIT_SCHEME=ssh
+export GERRIT_TOPIC=
+export GERRIT_VERSION=2.14.4
+export JOB_BASE_NAME=android-lcr-reference-x15-o
+export JOB_NAME=android-lcr-reference-x15-o
+export JOB_URL=https://ci.linaro.org/job/android-lcr-reference-x15-o/
+export PUB_DEST=/android/android-lcr-reference-x15-o/38
+export PUB_SRC=/home/buildslave/srv/r-lcr-oreo/build/out
+export RUN_CHANGES_DISPLAY_URL=https://ci.linaro.org/job/android-lcr-reference-x15-o/38/display/redirect?page=changes
+export RUN_DISPLAY_URL=https://ci.linaro.org/job/android-lcr-reference-x15-o/38/display/redirect
+export BUILD_URL=https://ci.linaro.org/job/android-lcr-reference-x15-o/38/
+export CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template.yaml
+export DOWNLOAD_URL=http://snapshots.linaro.org//android/android-lcr-reference-x15-o/38
+export EXECUTOR_NUMBER=18
+export FRONTEND_JOB_NAME=android-lcr-reference-x15-o
+export IMAGE_EXTENSION=img
+export JOB_NAME=android-lcr-reference-x15-o
+export JOB_URL=https://ci.linaro.org/job/post-build-lava/
+export LAVA_SERVER=lkft.validation.linaro.org/RPC2/
+export MAKE_TARGETS=droidcore
+export SKIP_REPORT=false
+export TARGET_PRODUCT=full_am57xevm
+
+export QA_SERVER=https://qa-reports.linaro.org/
+export QA_SERVER_PROJECT=lcr
+export QA_BUILD_VERSION=${BUILD_NUMBER}
+export QA_REPORTS_TOKEN=secret
+
+export DRY_RUN=true
+
+for device in $(ls ../lava-job-definitions/devices); do
+    case "$device" in
+      *boot*)
+        ;;
+      *)
+        export DEVICE_TYPE=$device
+        echo ${DEVICE_TYPE}
+        bash submit_for_testing.sh
+        ;;
+    esac
+done
+
+# cleanup virtualenv
+deactivate
+rm -rf .venv
diff --git a/android-lcr/hikey/builders-v2-premerge-ci.yaml.inc b/android-lcr/hikey/builders-v2-premerge-ci.yaml.inc
index a429706c5a..741f0f7c1e 100644
--- a/android-lcr/hikey/builders-v2-premerge-ci.yaml.inc
+++ b/android-lcr/hikey/builders-v2-premerge-ci.yaml.inc
@@ -8,37 +8,8 @@
         - shell:
             !include-raw:
                 - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-boottime.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-xtest-lmg.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-focused1-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-focused2-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-benchmarkpi.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
+        - inject:
+            properties-file: post_build_lava_parameters
+        - shell:
+            !include-raw:
+                - android-lcr/common/submit_for_testing.sh
diff --git a/android-lcr/lava-job-definitions/devices/hi6220-hikey b/android-lcr/lava-job-definitions/devices/hi6220-hikey
new file mode 100644
index 0000000000..cf705bbf23
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi6220-hikey
@@ -0,0 +1,42 @@
+{% extends "lcr.jinja2" %}
+
+{% block device_type %}hi6220-hikey{% endblock %}
+
+{% block deploy_target %}
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      ptable:
+        url: http://releases.linaro.org/reference-platform/enterprise/16.12/uefi/release/hikey/ptable-aosp-8g.img
+        reboot: hard-reset
+      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
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% include "devices/hi6220-hikey-boot" %}
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/devices/hi6220-hikey-boot b/android-lcr/lava-job-definitions/devices/hi6220-hikey-boot
new file mode 100644
index 0000000000..dcbc219643
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi6220-hikey-boot
@@ -0,0 +1,11 @@
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    - 'console:/'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
diff --git a/android-lcr/lava-job-definitions/devices/x15 b/android-lcr/lava-job-definitions/devices/x15
new file mode 100644
index 0000000000..1e6b0ea76e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/x15
@@ -0,0 +1,32 @@
+{% extends "lcr.jinja2" %}
+
+{% block device_type %}x15{% endblock %}
+
+{% block deploy_target %}
+- deploy:
+    timeout:
+      minutes: 25
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      environment:
+        url: {{DOWNLOAD_URL}}/am57xx-evm-reva3.dtb
+      boot:
+        url: {{ANDROID_BOOT}}
+      cache:
+        url: {{ANDROID_CACHE}}
+      userdata:
+        url: {{ANDROID_DATA}}
+      system:
+        url: {{ANDROID_SYSTEM}}
+      vendor:
+        url: {{DOWNLOAD_URL}}/vendor.img
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% include "devices/x15-boot" %}
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/devices/x15-boot b/android-lcr/lava-job-definitions/devices/x15-boot
new file mode 100644
index 0000000000..b9b4be4c73
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/x15-boot
@@ -0,0 +1,9 @@
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - 'am57xevm:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
diff --git a/android-lcr/lava-job-definitions/lcr.jinja2 b/android-lcr/lava-job-definitions/lcr.jinja2
new file mode 100644
index 0000000000..ded7475299
--- /dev/null
+++ b/android-lcr/lava-job-definitions/lcr.jinja2
@@ -0,0 +1,86 @@
+{% extends "master.jinja2" %}
+
+{% block global_settings %}
+context:
+  test_character_delay: 10
+
+timeouts:
+  job:
+    minutes: {% if job_timeout is defined %}{{ job_timeout }}{% else %}90{% endif %}
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+{% endblock global_settings %}
+
+{% block priority %}{{LAVA_JOB_PRIORITY}}{% endblock priority %}
+{% block visibility %}public{% endblock visibility %}
+
+{% block metadata %}
+  android.build: {{ANDROID_META_BUILD}}
+  android.name: {{ANDROID_META_NAME}}
+  android.url: {{ANDROID_META_URL}}
+  android.fastboot: "platform-tools_r26.0.0"
+{% endblock metadata %}
+
+{% block protocols %}
+protocols:
+  lava-lxc:
+    name: lxc-target
+    template: debian
+    distribution: debian
+    release: jessie
+    arch: amd64
+    mirror: http://mirror.bytemark.co.uk/debian
+{% endblock protocols %}
+
+{% block actions %}
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    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 http://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
+
+{% block deploy_target %}
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
+
+{% endblock actions %}
diff --git a/android-lcr/lava-job-definitions/master.jinja2 b/android-lcr/lava-job-definitions/master.jinja2
new file mode 100644
index 0000000000..5509c8cee8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/master.jinja2
@@ -0,0 +1,18 @@
+{% block global_settings %}
+{% endblock global_settings %}
+
+device_type: {% block device_type %}{% endblock %}
+job_name: {% block job_name %}{% endblock %}
+priority: {% block priority %}{% endblock %}
+visibility: {% block visibility %}{% endblock %}
+
+metadata:
+{% block metadata %}
+{% endblock metadata %}
+
+{% block protocols %}
+{% endblock protocols %}
+
+actions:
+{% block actions %}
+{% endblock actions %}
diff --git a/android-lcr/lava-job-definitions/master/template-apk-automation.yaml.jinja2 b/android-lcr/lava-job-definitions/master/template-apk-automation.yaml.jinja2
new file mode 100644
index 0000000000..73765f0472
--- /dev/null
+++ b/android-lcr/lava-job-definitions/master/template-apk-automation.yaml.jinja2
@@ -0,0 +1,19 @@
+{% extends device_type %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-{{testname}}{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}160{% endif %}
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/apk-automation/apk-automation.yaml
+          name: {{testname}}
+          params:
+            TEST_NAME: {{testname}}
+            LOOPS: 5
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/master/template-cts.yaml.jinja2 b/android-lcr/lava-job-definitions/master/template-cts.yaml.jinja2
new file mode 100644
index 0000000000..763806c3a7
--- /dev/null
+++ b/android-lcr/lava-job-definitions/master/template-cts.yaml.jinja2
@@ -0,0 +1,19 @@
+{% extends device_type %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-{{testname}}{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}300{% endif %}
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "run {{testname}} --abi {{abi}} --disable-reboot --skip-preconditions --skip-device-info"
+        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-8.1_r1.zip"
+      name: {{testname}}-{{abi}}
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/master/template-vts.yaml.jinja2 b/android-lcr/lava-job-definitions/master/template-vts.yaml.jinja2
new file mode 100644
index 0000000000..5b474d274d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/master/template-vts.yaml.jinja2
@@ -0,0 +1,21 @@
+{% extends device_type %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-{{testname}}{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}300{% endif %}
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/tradefed/tradefed.yaml
+      params:
+        TEST_URL: "http://testdata.validation.linaro.org/vts/oreo-vts-release-lcr-12192017/android-vts.zip"
+        TEST_PARAMS: "run {{testcommand}} --skip-device-info"
+        TEST_PATH: "android-vts"
+        RESULTS_FORMAT: "atomic"
+      name: {{testname}}
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/testplan/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/testplan/andebenchpro2015.yaml
new file mode 100644
index 0000000000..cd19e44d1b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/andebenchpro2015.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 150 %}
+{% set testname = "andebenchpro2015" %}
diff --git a/android-lcr/lava-job-definitions/testplan/antutu6.yaml b/android-lcr/lava-job-definitions/testplan/antutu6.yaml
new file mode 100644
index 0000000000..381a058726
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/antutu6.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 240 %}
+{% set testname = "antutu6" %}
diff --git a/android-lcr/lava-job-definitions/testplan/basic.yaml b/android-lcr/lava-job-definitions/testplan/basic.yaml
new file mode 100644
index 0000000000..1edb070fda
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/basic.yaml
@@ -0,0 +1,47 @@
+{% extends device_type %}
+
+{% set job_timeout = 90 %}
+{% set device_type_boot = device_type ~ "-boot" %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-basic{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: {% if job_timeout is defined %}{{ job_timeout-30|int|abs }}{% else %}60{% endif %}
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/meminfo/meminfo.yaml
+          name: meminfo-first
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/busybox/busybox.yaml
+          name: busybox
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/ping/ping.yaml
+          name: ping
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/linaro-android-kernel-tests/linaro-android-kernel-tests.yaml
+          name: linaro-android-kernel-tests
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/tjbench/tjbench.yaml
+          name: tjbench
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 15
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/meminfo/meminfo.yaml
+          name: meminfo-second
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/testplan/benchmarkpi.yaml b/android-lcr/lava-job-definitions/testplan/benchmarkpi.yaml
new file mode 100644
index 0000000000..a378ee0fc8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/benchmarkpi.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 35 %}
+{% set testname = "benchmarkpi" %}
+
diff --git a/android-lcr/lava-job-definitions/testplan/boottime.yaml b/android-lcr/lava-job-definitions/testplan/boottime.yaml
new file mode 100644
index 0000000000..d568744ee6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/boottime.yaml
@@ -0,0 +1,163 @@
+{% extends device_type %}
+
+{% set job_timeout = 90 %}
+{% set device_type_boot = device_type ~ "-boot" %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-boottime{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - 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"
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-1
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 1
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-2
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 2
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-3
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 3
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-4
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 4
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-5
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 5
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-6
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 6
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-7
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 7
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-second-analyze
+          params:
+            OPERATION: ANALYZE
+            COLLECT_NO: 7
+
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/bootchart/bootchart.yaml
+          name: bootchart-start
+          params:
+            OPERATION: start
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/bootchart/bootchart.yaml
+          name: bootchart-stop
+          params:
+            OPERATION: stop
+
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/testplan/caffeinemark.yaml b/android-lcr/lava-job-definitions/testplan/caffeinemark.yaml
new file mode 100644
index 0000000000..71d4929991
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/caffeinemark.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "caffeinemark" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cf-bench.yaml b/android-lcr/lava-job-definitions/testplan/cf-bench.yaml
new file mode 100644
index 0000000000..9b0cd720ec
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cf-bench.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 120 %}
+{% set testname = "cf-bench" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/testplan/cts-focused1-v7a.yaml
new file mode 100644
index 0000000000..4c22c46dec
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-focused1-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-focused1" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/testplan/cts-focused1-v8a.yaml
new file mode 100644
index 0000000000..219537641b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-focused1-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-focused1" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/testplan/cts-focused2-v7a.yaml
new file mode 100644
index 0000000000..50291ab800
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-focused2-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-focused2" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/testplan/cts-focused2-v8a.yaml
new file mode 100644
index 0000000000..ee4a5216ec
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-focused2-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-focused2" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-media-v7a.yaml b/android-lcr/lava-job-definitions/testplan/cts-media-v7a.yaml
new file mode 100644
index 0000000000..6927d6d3ba
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-media-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-media" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-media-v8a.yaml b/android-lcr/lava-job-definitions/testplan/cts-media-v8a.yaml
new file mode 100644
index 0000000000..ce48e909b5
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-media-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-media" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-media2-v7a.yaml b/android-lcr/lava-job-definitions/testplan/cts-media2-v7a.yaml
new file mode 100644
index 0000000000..6aafff04a0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-media2-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-media2" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-media2-v8a.yaml b/android-lcr/lava-job-definitions/testplan/cts-media2-v8a.yaml
new file mode 100644
index 0000000000..0c539055a8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-media2-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-media2" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-opengl-v7a.yaml b/android-lcr/lava-job-definitions/testplan/cts-opengl-v7a.yaml
new file mode 100644
index 0000000000..5a28596e59
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-opengl-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-opengl" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-opengl-v8a.yaml b/android-lcr/lava-job-definitions/testplan/cts-opengl-v8a.yaml
new file mode 100644
index 0000000000..d51203a091
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-opengl-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-opengl" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-part1-v7a.yaml b/android-lcr/lava-job-definitions/testplan/cts-part1-v7a.yaml
new file mode 100644
index 0000000000..f8bb32d73b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-part1-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-part1" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-part1-v8a.yaml b/android-lcr/lava-job-definitions/testplan/cts-part1-v8a.yaml
new file mode 100644
index 0000000000..8ef8cbafd6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-part1-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 360 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-part1" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-part2-v7a.yaml b/android-lcr/lava-job-definitions/testplan/cts-part2-v7a.yaml
new file mode 100644
index 0000000000..bb6e7c609d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-part2-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 540 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-part2" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-part2-v8a.yaml b/android-lcr/lava-job-definitions/testplan/cts-part2-v8a.yaml
new file mode 100644
index 0000000000..900344fb9a
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-part2-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 510 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-part2" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-part3-v7a.yaml b/android-lcr/lava-job-definitions/testplan/cts-part3-v7a.yaml
new file mode 100644
index 0000000000..15f823485e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-part3-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-part3" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-part3-v8a.yaml b/android-lcr/lava-job-definitions/testplan/cts-part3-v8a.yaml
new file mode 100644
index 0000000000..f423aeb5db
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-part3-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-part3" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-part4-v7a.yaml b/android-lcr/lava-job-definitions/testplan/cts-part4-v7a.yaml
new file mode 100644
index 0000000000..423ea5b477
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-part4-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-part4" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-part4-v8a.yaml b/android-lcr/lava-job-definitions/testplan/cts-part4-v8a.yaml
new file mode 100644
index 0000000000..5f34705a6e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-part4-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-part4" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-part5-v7a.yaml b/android-lcr/lava-job-definitions/testplan/cts-part5-v7a.yaml
new file mode 100644
index 0000000000..d1010040b3
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-part5-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 240 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-part5" %}
diff --git a/android-lcr/lava-job-definitions/testplan/cts-part5-v8a.yaml b/android-lcr/lava-job-definitions/testplan/cts-part5-v8a.yaml
new file mode 100644
index 0000000000..e67cb46e35
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/cts-part5-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 240 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-part5" %}
diff --git a/android-lcr/lava-job-definitions/testplan/gearses2eclair.yaml b/android-lcr/lava-job-definitions/testplan/gearses2eclair.yaml
new file mode 100644
index 0000000000..af63329e17
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/gearses2eclair.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 120 %}
+{% set testname = "gearses2eclair" %}
diff --git a/android-lcr/lava-job-definitions/testplan/geekbench3.yaml b/android-lcr/lava-job-definitions/testplan/geekbench3.yaml
new file mode 100644
index 0000000000..a383988045
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/geekbench3.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testname = "geekbench3" %}
diff --git a/android-lcr/lava-job-definitions/testplan/glbenchmark25.yaml b/android-lcr/lava-job-definitions/testplan/glbenchmark25.yaml
new file mode 100644
index 0000000000..7a9addd4a8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/glbenchmark25.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testname = "glbenchmark25" %}
diff --git a/android-lcr/lava-job-definitions/testplan/javawhetstone.yaml b/android-lcr/lava-job-definitions/testplan/javawhetstone.yaml
new file mode 100644
index 0000000000..74c3b3c9db
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/javawhetstone.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "javawhetstone" %}
diff --git a/android-lcr/lava-job-definitions/testplan/jbench.yaml b/android-lcr/lava-job-definitions/testplan/jbench.yaml
new file mode 100644
index 0000000000..7904f93da2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/jbench.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "jbench" %}
diff --git a/android-lcr/lava-job-definitions/testplan/linpack.yaml b/android-lcr/lava-job-definitions/testplan/linpack.yaml
new file mode 100644
index 0000000000..dd648b2e5b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/linpack.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "linpack" %}
diff --git a/android-lcr/lava-job-definitions/testplan/quadrantpro.yaml b/android-lcr/lava-job-definitions/testplan/quadrantpro.yaml
new file mode 100644
index 0000000000..c4a12ebc66
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/quadrantpro.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "quadrantpro" %}
diff --git a/android-lcr/lava-job-definitions/testplan/rl-sqlite.yaml b/android-lcr/lava-job-definitions/testplan/rl-sqlite.yaml
new file mode 100644
index 0000000000..a0e84c701b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/rl-sqlite.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "rl-sqlite" %}
diff --git a/android-lcr/lava-job-definitions/testplan/scimark.yaml b/android-lcr/lava-job-definitions/testplan/scimark.yaml
new file mode 100644
index 0000000000..cade098a05
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/scimark.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "scimark" %}
diff --git a/android-lcr/lava-job-definitions/testplan/vellamo3.yaml b/android-lcr/lava-job-definitions/testplan/vellamo3.yaml
new file mode 100644
index 0000000000..1d799fd293
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/vellamo3.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 180 %}
+{% set testname = "vellamo3" %}
diff --git a/android-lcr/lava-job-definitions/testplan/vts-part1.yaml b/android-lcr/lava-job-definitions/testplan/vts-part1.yaml
new file mode 100644
index 0000000000..8fff672cbf
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/vts-part1.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-kernel --exclude-filter VtsKernelLinuxKselftest --exclude-filter VtsKernelLtp" %}
+{% set testname = "vts-kernel-part1" %}
diff --git a/android-lcr/lava-job-definitions/testplan/vts-part2.yaml b/android-lcr/lava-job-definitions/testplan/vts-part2.yaml
new file mode 100644
index 0000000000..4d6fe0f579
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/vts-part2.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-kernel --module VtsKernelLinuxKselftest" %}
+{% set testname = "vts-kernel-kselftest" %}
diff --git a/android-lcr/lava-job-definitions/testplan/vts-part3.yaml b/android-lcr/lava-job-definitions/testplan/vts-part3.yaml
new file mode 100644
index 0000000000..640f9263aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/vts-part3.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "ivts-kernel --module VtsKernelLtp" %}
+{% set testname = "vts-kernel-ltp" %}
diff --git a/android-lcr/lava-job-definitions/testplan/vts-part4.yaml b/android-lcr/lava-job-definitions/testplan/vts-part4.yaml
new file mode 100644
index 0000000000..6e89915997
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/vts-part4.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-library" %}
+{% set testname = "vts-library" %}
diff --git a/android-lcr/lava-job-definitions/testplan/vts-part5.yaml b/android-lcr/lava-job-definitions/testplan/vts-part5.yaml
new file mode 100644
index 0000000000..6ee21b43dd
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/vts-part5.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-performance" %}
+{% set testname = "vts-performance" %}
diff --git a/android-lcr/lava-job-definitions/testplan/vts-part6.yaml b/android-lcr/lava-job-definitions/testplan/vts-part6.yaml
new file mode 100644
index 0000000000..59b31a5132
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/vts-part6.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-hal" %}
+{% set testname = "vts-hal" %}
diff --git a/android-lcr/lava-job-definitions/testplan/weekly.yaml b/android-lcr/lava-job-definitions/testplan/weekly.yaml
new file mode 100644
index 0000000000..c08cec06b0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/weekly.yaml
@@ -0,0 +1,46 @@
+{% extends device_type %}
+
+{% set job_timeout = 120 %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-optee{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}160{% endif %}
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/media-codecs-functional-tests/media-codecs-functional-tests.yaml
+          name: media-codecs
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/piglit-gles2/piglit-gles2.yaml
+          name: piglit-gles2
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/piglit-gles3/piglit-gles3.yaml
+          name: piglit-gles3
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/piglit-glslparser/piglit-glslparser.yaml
+          name: piglit-glslparser
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/piglit-shader-runner/piglit-shader-runner.yaml
+          name: piglit-shader-runner
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/bionic-benchmarks/bionic-benchmarks.yaml
+          name: bionic-benchmarks
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/stringbench/stringbench.yaml
+          name: stringbench
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/libc-bench/libc-bench.yaml
+          name: libc-bench
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/testplan/xtest-lmg.yaml b/android-lcr/lava-job-definitions/testplan/xtest-lmg.yaml
new file mode 100644
index 0000000000..6c9c0d097d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/testplan/xtest-lmg.yaml
@@ -0,0 +1,18 @@
+{% extends device_type %}
+
+{% set job_timeout = 90 %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-optee{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}160{% endif %}
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/optee/optee-xtest.yaml
+          name: optee-xtest
+{% endblock test_target %}
diff --git a/android-lcr/x15/builders-v2-premerge-ci.yaml.inc b/android-lcr/x15/builders-v2-premerge-ci.yaml.inc
index 76f804baa8..9036aaa6e9 100644
--- a/android-lcr/x15/builders-v2-premerge-ci.yaml.inc
+++ b/android-lcr/x15/builders-v2-premerge-ci.yaml.inc
@@ -8,31 +8,8 @@
         - shell:
             !include-raw:
                 - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-boottime.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-focused1-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-focused2-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-benchmarkpi.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
+        - inject:
+            properties-file: post_build_lava_parameters
+        - shell:
+            !include-raw:
+                - android-lcr/common/submit_for_testing.sh