diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2017-10-23 14:40:40 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2017-10-23 14:40:40 +0800 |
| commit | c170bf10d5038baa3d47fdfe3e69521719326f09 (patch) | |
| tree | 455589ef6fc6957cae5ea6376ce4011b04f2f210 | |
| parent | 0d86aaf8b95fa2a90dfc22162c2cb1b01bc14b31 (diff) | |
delete testuser first to make sure the creation of testuser run successfully
Change-Id: I8f0751e5275022dedd5ef15902f62f77f1612a73
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | automated/android/tradefed/tradefed.yaml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/automated/android/tradefed/tradefed.yaml b/automated/android/tradefed/tradefed.yaml index 77b90b4..d3da4aa 100644 --- a/automated/android/tradefed/tradefed.yaml +++ b/automated/android/tradefed/tradefed.yaml @@ -36,9 +36,11 @@ run: # Run setup.sh in the original shell to reserve env variables. - . ./setup.sh - echo "after ./setup.sh" - - id -u testuser2 || sudo useradd -m testuser2 - - echo "after useradd" - - sudo -u testuser2 ./tradefed.sh -o "${TIMEOUT}" -c "${TEST_URL}" -t "${TEST_PARAMS}" -p "${TEST_PATH}" -r "${RESULTS_FORMAT}" -n "${ANDROID_SERIAL}" + # delete the test user to clean environment + - 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}" # Upload test log and result files to artifactorial. - cp -r ./${TEST_PATH}/results ./output/ || true - cp -r ./${TEST_PATH}/logs ./output/ || true @@ -47,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 testuser2 -f -r || true + - sudo userdel testuser -f -r ; echo "testuser deleted" |