summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2017-10-23 17:04:55 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2017-10-23 17:04:55 +0800
commite21821bb4ba314cf6276bcebd368204c52491a7c (patch)
tree54aedbb2cbec1666f91fd35997b514b969d4d0c4
parentc170bf10d5038baa3d47fdfe3e69521719326f09 (diff)
return 0 even userdel failed
Change-Id: I88a17d7a6c93cee42287afa76949ec0cea13fb1b Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rw-r--r--automated/android/tradefed/tradefed.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/automated/android/tradefed/tradefed.yaml b/automated/android/tradefed/tradefed.yaml
index d3da4aa..235078c 100644
--- a/automated/android/tradefed/tradefed.yaml
+++ b/automated/android/tradefed/tradefed.yaml
@@ -37,7 +37,7 @@ run:
- . ./setup.sh
- echo "after ./setup.sh"
# delete the test user to clean environment
- - sudo userdel testuser -r -f; true
+ - sudo userdel testuser -r -f || true
# create test use to run the cts/vts tests
- sudo useradd -m testuser && echo "testuser created successfully"
- sudo -u testuser ./tradefed.sh -o "${TIMEOUT}" -c "${TEST_URL}" -t "${TEST_PARAMS}" -p "${TEST_PATH}" -r "${RESULTS_FORMAT}" -n "${ANDROID_SERIAL}"
@@ -49,4 +49,4 @@ run:
- ../../utils/upload-to-artifactorial.sh -a "${ATTACHMENT}" -u "${URL}" -t "${TOKEN}"
# Send test result to LAVA.
- ../../utils/send-to-lava.sh ./output/result.txt
- - sudo userdel testuser -f -r ; echo "testuser deleted"
+ - sudo userdel testuser -f -r || true