aboutsummaryrefslogtreecommitdiff
path: root/android-master-clang
diff options
context:
space:
mode:
authorChase Qi <chase.qi@linaro.org>2018-11-12 19:23:49 +0800
committerVishal Bhoj <vishal.bhoj@linaro.org>2018-11-14 18:05:54 +0000
commit6d6435bbcdf185e36d7814ee83c4aad28c6838ed (patch)
tree568cac4f698892ec66e1a9d44db32040d74b6c57 /android-master-clang
parent4e0e18d59b9bb694ea8c0b51f3134a201aed53ff (diff)
lava-job-definitions: fix installation of android platform tools
When /usr/bin/{fastboot,adb} exists, the current way to install these tools fails, and test job continues with wrong version tools. Refer to Jira story: https://projects.linaro.org/browse/LSS-231 automated/linux/android-platform-tools/install.sh from QA test-definitions repo will remove adb/fastboot if installed and install the ones specified with $LINK var. If any step fails, test job will be killed with lava-test-raise. A test error will be printed as well. Change-Id: I6d32b040acebac53b6d2b65498b4c538c88a6071 Signed-off-by: Chase Qi <chase.qi@linaro.org>
Diffstat (limited to 'android-master-clang')
-rw-r--r--android-master-clang/lava-job-definitions/boottime-android-master-clang.yaml21
1 files changed, 6 insertions, 15 deletions
diff --git a/android-master-clang/lava-job-definitions/boottime-android-master-clang.yaml b/android-master-clang/lava-job-definitions/boottime-android-master-clang.yaml
index 2c088436..4d36e667 100644
--- a/android-master-clang/lava-job-definitions/boottime-android-master-clang.yaml
+++ b/android-master-clang/lava-job-definitions/boottime-android-master-clang.yaml
@@ -52,21 +52,12 @@ actions:
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
+ - repository: https://git.linaro.org/qa/test-definitions.git
+ from: git
+ path: automated/linux/android-platform-tools/install.yaml
+ name: install-android-platform-tools-r2600
+ parameters:
+ LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
- deploy:
timeout: