diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2017-09-19 19:11:33 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2017-09-19 19:11:33 +0800 |
| commit | af0bab1f4da3286a878266d4f2451c46c287d252 (patch) | |
| tree | e8b2a645fee96b1f003c1eb3fa96a04e3c2a3f8d | |
| parent | 3b909a25058e66157d7239fe559530ee5de0e0f5 (diff) | |
android boottime and bootchart: install curl package
and update the token for artifactorial token
Change-Id: I7d3901ee4fdd7ea55e4a0545c18327ef05b63cd5
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | automated/android/bootchart/bootchart.yaml | 6 | ||||
| -rwxr-xr-x | automated/android/boottime/boottime.sh | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/automated/android/bootchart/bootchart.yaml b/automated/android/bootchart/bootchart.yaml index 410948c..a303be5 100644 --- a/automated/android/bootchart/bootchart.yaml +++ b/automated/android/bootchart/bootchart.yaml @@ -23,12 +23,12 @@ params: OPERATION: "start" BOOTCHART_TIME: "120" # Specify url and token for publishing artifacts. - ARTIFACTORIAL_URL: "https://archive.validation.linaro.org/artifacts/team/qa/" - ARTIFACTORIAL_TOKEN: "" + URL: "https://archive.validation.linaro.org/artifacts/team/qa/" + TOKEN: "4373c97b474497dbd12373689d7d492e" run: steps: - cd ./automated/android/bootchart/ - ./bootchart.sh -S "${SKIP_INSTALL}" -t "${BOOT_TIMEOUT}" -s "${ANDROID_SERIAL}" -o "${OPERATION}" -T "${BOOTCHART_TIME}" - - ../../utils/upload-to-artifactorial.sh -a "./output/output-bootchart.tar.xz" -u "${ARTIFACTORIAL_URL}" -t "${ARTIFACTORIAL_TOKEN}" + - ../../utils/upload-to-artifactorial.sh -a "./output/output-bootchart.tar.xz" -u "${URL}" -t "${TOKEN}" - ../../utils/send-to-lava.sh ./output/result.txt diff --git a/automated/android/boottime/boottime.sh b/automated/android/boottime/boottime.sh index b67e4ff..2d271c7 100755 --- a/automated/android/boottime/boottime.sh +++ b/automated/android/boottime/boottime.sh @@ -11,12 +11,13 @@ OUTPUT="$(pwd)/output" . ../../lib/android-test-lib usage() { - echo "Usage: $0 [-s <android_serial>] [-t <boot_timeout>] [-o <COLLECT|ANALYZE>] [-n <collect_no>]" 1>&2 + echo "Usage: $0 [-S <skip_install>] [-s <android_serial>] [-t <boot_timeout>] [-o <COLLECT|ANALYZE>] [-n <collect_no>]" 1>&2 exit 1 } -while getopts ":s:t:o:n:" o; do +while getopts ":S:s:t:o:n:" o; do case "$o" in + S) SKIP_INSTALL="${OPTARG}" ;; s) ANDROID_SERIAL="${OPTARG}" ;; t) BOOT_TIMEOUT="${OPTARG}" ;; o) OPERATION="${OPTARG}" ;; @@ -28,6 +29,7 @@ done initialize_adb wait_boot_completed "${BOOT_TIMEOUT}" create_out_dir "${OUTPUT}" +install_deps 'curl tar xz-utils' "${SKIP_INSTALL}" adb_push "./device-script.sh" "/data/local/tmp/" info_msg "device-${ANDROID_SERIAL}: About to run boottime ${OPERATION} ${COLLECT_NO}..." |