diff options
| author | Chase Qi <chase.qi@linaro.org> | 2017-05-05 15:14:49 +0800 |
|---|---|---|
| committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2017-05-08 14:28:32 +0000 |
| commit | 130dcebd0a72551ec7592101ac7c6b07d593de0c (patch) | |
| tree | 9ef67fa9416007c995c4f064b80a9283df74fcbf /automated | |
| parent | 82db70775d6a1edb983caf2e60d9101a5ad881f3 (diff) | |
android: tradefed: fix package installation
* Added support for Ubuntu
* Removed support for Debian
Change-Id: I4cc4074e455b8007f8f68e33815312846c344435
Signed-off-by: Chase Qi <chase.qi@linaro.org>
Diffstat (limited to 'automated')
| -rwxr-xr-x | automated/android/tradefed/setup.sh | 25 | ||||
| -rw-r--r-- | automated/android/tradefed/tradefed.yaml | 1 |
2 files changed, 6 insertions, 20 deletions
diff --git a/automated/android/tradefed/setup.sh b/automated/android/tradefed/setup.sh index 26ab73a..8f3bc1d 100755 --- a/automated/android/tradefed/setup.sh +++ b/automated/android/tradefed/setup.sh @@ -1,37 +1,24 @@ #!/bin/sh -x - +# shellcheck disable=SC2154 # shellcheck disable=SC1091 + . ../../lib/sh-test-lib -# shellcheck disable=SC1091 . ../../lib/android-test-lib JDK="openjdk-8-jdk-headless" -PKG_DEPS="curl wget zip xz-utils python-lxml python-setuptools python-pexpect aapt android-tools-adb lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386" +PKG_DEPS="curl wget zip xz-utils python-lxml python-setuptools python-pexpect aapt lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386" dist_name -dist_info -# shellcheck disable=SC2154 case "${dist}" in - debian) + ubuntu) dpkg --add-architecture i386 - dist_info - echo "deb [arch=amd64,i386] http://ftp.us.debian.org/debian ${Codename} main non-free contrib" > /etc/apt/sources.list.d/tradefed.list - if [ "${Codename}" != "sid" ]; then - echo "deb http://ftp.debian.org/debian ${Codename}-backports main" >> /etc/apt/sources.list.d/tradefed.list - fi - cat /etc/apt/sources.list.d/tradefed.list - apt-get update || true - install_deps "${JDK}" || install_deps "-t ${Codename}-backports ${JDK}" - install_deps "${PKG_DEPS}" + install_deps "${PKG_DEPS} ${JDK}" ;; *) - install_deps "${PKG_DEPS} ${JDK}" + error_msg "Please use Ubuntu for CTS or VTS test." ;; esac install_latest_adb initialize_adb adb_root - -# Cleanup. -rm -f /etc/apt/sources.list.d/tradefed.list diff --git a/automated/android/tradefed/tradefed.yaml b/automated/android/tradefed/tradefed.yaml index efdf147..86a8ad5 100644 --- a/automated/android/tradefed/tradefed.yaml +++ b/automated/android/tradefed/tradefed.yaml @@ -17,7 +17,6 @@ params: SKIP_INSTALL: "false" # Specify timeout in seconds for wait_boot_completed and wait_homescreen. TIMEOUT: "300" - JDK: "openjdk-8-jdk-headless" # Download CTS package or copy it from local disk. # CTS_URL: "/root/android-cts/linaro/7.1_r1/android-cts-7.1_r1.zip" TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-7.1_r1.zip" |