summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Qi <chase.qi@linaro.org>2017-10-24 07:13:32 +0000
committerLinaro Code Review <review@review.linaro.org>2017-10-24 07:13:32 +0000
commitfd68200014e7b5793bc25df654124df761a4b047 (patch)
tree2fa31ae8595c1f8ce1b69f9d7d921682911370c0
parentd76bef3e0aa79150049b1aeb41824449a7f74ee6 (diff)
parentf5e6b93ba115a5881dcac572889834a02069b368 (diff)
Merge "android tradefed: workaround for chown testuser home directory"
-rw-r--r--automated/android/tradefed/tradefed.yaml8
1 files changed, 6 insertions, 2 deletions
diff --git a/automated/android/tradefed/tradefed.yaml b/automated/android/tradefed/tradefed.yaml
index 4d3d467..5d6515e 100644
--- a/automated/android/tradefed/tradefed.yaml
+++ b/automated/android/tradefed/tradefed.yaml
@@ -35,8 +35,11 @@ run:
- cd ./automated/android/tradefed
# Run setup.sh in the original shell to reserve env variables.
- . ./setup.sh
- - id -u testuser &>/dev/null || useradd testuser
- - mkdir -p /home/testuser; chown testuser.testuser /home/testuser
+ - echo "after ./setup.sh"
+ # delete the test user to clean environment
+ - userdel testuser -r -f || true
+ # create test use to run the cts/vts tests
+ - 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}"
# Upload test log and result files to artifactorial.
- cp -r ./${TEST_PATH}/results ./output/ || true
@@ -46,3 +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
+ - userdel testuser -f -r || true