diff options
| author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2018-02-22 14:34:03 +0000 |
|---|---|---|
| committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2018-02-22 14:34:03 +0000 |
| commit | 4173e645e1aa721f887e73077c7df0a37ea6a970 (patch) | |
| tree | ebc150a371275d0a15b959955cc6244eed1576c5 | |
| parent | ddf5fcb34db3d4e6ddd893836dd22e14f86cce9e (diff) | |
Revert "automated: workload-automation: allow for custom output path"
This reverts commit ddf5fcb34db3d4e6ddd893836dd22e14f86cce9e.
Change-Id: Ie1e923b7bf02395b0a9e5d240b691c4daa7a7754
| -rwxr-xr-x | automated/android/workload-automation/workload-automation.sh | 6 | ||||
| -rw-r--r-- | automated/android/workload-automation/workload-automation.yaml | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/automated/android/workload-automation/workload-automation.sh b/automated/android/workload-automation/workload-automation.sh index c31bccd..e273f4e 100755 --- a/automated/android/workload-automation/workload-automation.sh +++ b/automated/android/workload-automation/workload-automation.sh @@ -22,7 +22,7 @@ usage() { exit 1 } -while getopts ":s:S:t:T:r:g:c:a:b:w:p:o:" opt; do +while getopts ":s:S:t:T:r:g:c:a:b:w:p:" opt; do case "${opt}" in s) SKIP_INSTALL="${OPTARG}" ;; S) ANDROID_SERIAL="${OPTARG}" ;; @@ -35,7 +35,6 @@ while getopts ":s:S:t:T:r:g:c:a:b:w:p:o:" opt; do b) BUILD_TOOLS_URL="${OPTARG}" ;; w) WA_HOME_URL="${OPTARG}" ;; p) PROBE="${OPTARG}" ;; - o) NEW_OUTPUT="${OPTARG}" ;; *) usage ;; esac done @@ -44,9 +43,6 @@ done . "${TEST_DIR}/../../lib/android-test-lib" cd "${TEST_DIR}" -if [ ! -z "${NEW_OUTPUT}" ]; then - OUTPUT="${NEW_OUTPUT}" -fi create_out_dir "${OUTPUT}" if [ "${SKIP_INSTALL}" = "true" ] || [ "${SKIP_INSTALL}" = "True" ]; then diff --git a/automated/android/workload-automation/workload-automation.yaml b/automated/android/workload-automation/workload-automation.yaml index 4718c44..4aa8a7e 100644 --- a/automated/android/workload-automation/workload-automation.yaml +++ b/automated/android/workload-automation/workload-automation.yaml @@ -32,9 +32,6 @@ params: # allow extra extenstions for WA WA_EXTENSION_PATHS: "" PROBE: "" - # directory where the WA results are stored - # defaults to {TEST_DIR}/output - OUTPUT: "" # Specify url and token for publishing artifacts. # For safety reasons, please set 'ARTIFACTORIAL_TOKEN' variable in job definition with # 'secrets' dictionary, and set job visibility to personal or group. @@ -47,7 +44,7 @@ run: - export WA_EXTENSION_PATHS=$WA_EXTENSION_PATHS - cd ./automated/android/workload-automation # Test run. - - ./workload-automation.sh -s "${SKIP_INSTALL}" -t "${BOOT_TIMEOUT}" -S "${ANDROID_SERIAL}" -T "${WA_TAG}" -r "${WA_TEMPLATES_REPO}" -g "${TEMPLATES_BRANCH}" -c "${CONFIG}" -a "${AGENDA}" -b "${BUILD_TOOLS_URL}" -w "${WA_HOME_URL}" -p "${PROBE}" -o "${OUTPUT}" + - ./workload-automation.sh -s "${SKIP_INSTALL}" -t "${BOOT_TIMEOUT}" -S "${ANDROID_SERIAL}" -T "${WA_TAG}" -r "${WA_TEMPLATES_REPO}" -g "${TEMPLATES_BRANCH}" -c "${CONFIG}" -a "${AGENDA}" -b "${BUILD_TOOLS_URL}" -w "${WA_HOME_URL}" -p "${PROBE}" # Upload test output to artifactorial. - tar caf "wa-output.tar.xz" "./output" - ../../utils/upload-to-artifactorial.sh -a "wa-output.tar.xz" -u "${ARTIFACTORIAL_URL}" -t "${ARTIFACTORIAL_TOKEN}" |