diff options
| author | Karsten Tausche <karsten@fairphone.com> | 2018-03-20 10:47:31 +0100 |
|---|---|---|
| committer | Karsten Tausche <karsten@fairphone.com> | 2018-03-20 11:54:22 +0100 |
| commit | 3546a7caae6bc9213dcaf6f80d0f3bcf83b6ebfb (patch) | |
| tree | 7464c1834d9986c00b15c9b9a94f56f26a291556 | |
| parent | 584800b4209a9f318afb74d0c13effbfb9a5050f (diff) | |
Always run apt-get update after dpkg --add-architecture
install_deps() in sh-test-lib only triggers apt-get update every 6
hours. It does not see that the apt cache is outdated after adding a new
architecture, so the update needs to be called manually.
Change-Id: I60a9bb5f2ee4af2bf1a7d58f8e74d354fa9ce4af
| -rwxr-xr-x | automated/android/tradefed/setup.sh | 1 | ||||
| -rwxr-xr-x | automated/android/workload-automation/workload-automation.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/automated/android/tradefed/setup.sh b/automated/android/tradefed/setup.sh index e0f38d3..fb5eb5b 100755 --- a/automated/android/tradefed/setup.sh +++ b/automated/android/tradefed/setup.sh @@ -16,6 +16,7 @@ dist_name case "${dist}" in ubuntu) dpkg --add-architecture i386 + apt-get update -q install_deps "${PKG_DEPS} ${JDK}" ;; *) diff --git a/automated/android/workload-automation/workload-automation.sh b/automated/android/workload-automation/workload-automation.sh index bbd5c46..68c997d 100755 --- a/automated/android/workload-automation/workload-automation.sh +++ b/automated/android/workload-automation/workload-automation.sh @@ -51,6 +51,7 @@ else PKGS="git wget zip tar xz-utils python python-yaml python-lxml python-setuptools python-numpy python-colorama python-pip sqlite3 lib32stdc++6 lib32z1 lib32gcc1 lib32ncurses5 aapt time sysstat python-jinja2 curl" ! check_root && error_msg "Please run this test as root." dpkg --add-architecture i386 + apt-get update -q install_deps "${PKGS}" # only install adb if it's not already available which adb || install_deps adb |