diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2018-07-10 23:06:41 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2018-07-10 15:13:51 +0000 |
| commit | 49d0edd2cbfab297f1df4e1f8c3a32fa6f2831b8 (patch) | |
| tree | b89153a876ff915e7a9becdb586aa11df9d59e2a | |
| parent | 46743ec73718879b1266354e7c3707bd0acca64f (diff) | |
android lcr cts & vts templates: add ANDROID_VERSION for master builds
since the master version cts/vts tests need to have ANDROID_VERSION specified to aosp-master
for the tradefed test wrapper script to install jdk9
Change-Id: I617427d0a582a90635fb79b20b998e829c93b647
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | android-lcr/lava-job-definitions/master/template-cts.yaml.jinja2 | 3 | ||||
| -rw-r--r-- | android-lcr/lava-job-definitions/master/template-vts.yaml.jinja2 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/android-lcr/lava-job-definitions/master/template-cts.yaml.jinja2 b/android-lcr/lava-job-definitions/master/template-cts.yaml.jinja2 index c763966bdd..c3d645b4ae 100644 --- a/android-lcr/lava-job-definitions/master/template-cts.yaml.jinja2 +++ b/android-lcr/lava-job-definitions/master/template-cts.yaml.jinja2 @@ -19,6 +19,9 @@ {% else %} TEST_URL: "http://testdata.linaro.org/cts/18.06/android-cts-8.1_r6-linux_x86-arm-linaro.zip" {% endif %} +{% if ANDROID_VERSION_SUFFIX is defined and ANDROID_VERSION_SUFFIX == 'master' %} + ANDROID_VERSION: "aosp-master" +{% endif %} FAILURES_PRINTED: "300" 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 index 87726e0762..101ad14493 100644 --- a/android-lcr/lava-job-definitions/master/template-vts.yaml.jinja2 +++ b/android-lcr/lava-job-definitions/master/template-vts.yaml.jinja2 @@ -18,6 +18,9 @@ {% else %} TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-06262018/android-vts.zip" {% endif %} +{% if ANDROID_VERSION_SUFFIX is defined and ANDROID_VERSION_SUFFIX == 'master' %} + ANDROID_VERSION: "aosp-master" +{% endif %} TEST_PARAMS: "run {{testcommand}} --skip-device-info" TEST_PATH: "android-vts" RESULTS_FORMAT: "atomic" |